Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Thu, 8 Oct 2015 12:04:23 +0000 (14:04 +0200)
committerKatja Luther <k.luther@bgbm.org>
Thu, 8 Oct 2015 12:04:23 +0000 (14:04 +0200)

Trivial merge