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

Trivial merge