Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Thu, 16 Jul 2015 12:11:39 +0000 (14:11 +0200)
committerKatja Luther <k.luther@bgbm.org>
Thu, 16 Jul 2015 12:11:39 +0000 (14:11 +0200)
commit5b999d8fc89e66f24e1ec3f82ca353ebc9dd60cb
tree2c9c6061fd49ce64b61e7901a70ecb3dd96001e0
parente984ad30adf923b8ad5b8b8e991d7d5aea1305ee
parentae8eab5f0b52f1f11775534cfa9a80d2b846f9cb
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop