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

Trivial merge