Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Thu, 10 Mar 2016 12:03:23 +0000 (13:03 +0100)
committerKatja Luther <k.luther@bgbm.org>
Thu, 10 Mar 2016 12:03:23 +0000 (13:03 +0100)

Trivial merge