Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Tue, 23 Feb 2016 10:39:45 +0000 (11:39 +0100)
committerKatja Luther <k.luther@bgbm.org>
Tue, 23 Feb 2016 10:39:45 +0000 (11:39 +0100)

Trivial merge