Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Wed, 14 Oct 2015 08:19:00 +0000 (10:19 +0200)
committerKatja Luther <k.luther@bgbm.org>
Wed, 14 Oct 2015 08:19:00 +0000 (10:19 +0200)

Trivial merge