Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Thu, 19 Nov 2015 10:16:26 +0000 (11:16 +0100)
committerKatja Luther <k.luther@bgbm.org>
Thu, 19 Nov 2015 10:16:26 +0000 (11:16 +0100)

Trivial merge