Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Mon, 29 Feb 2016 12:43:59 +0000 (13:43 +0100)
committerKatja Luther <k.luther@bgbm.org>
Mon, 29 Feb 2016 12:43:59 +0000 (13:43 +0100)
commit4a5178d364443f04065c5b095a5657a8bc6155f1
tree45bbcdf2b56fbfc394a95a7d182f96a4a4cfab97
parent83a0646794568efa909ca3a18a608f49fd71dd89
parent9fd777fc7596e56fd1f3aab5771259d70ee1e9e1
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop