Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Mon, 16 Nov 2015 11:37:33 +0000 (12:37 +0100)
committerKatja Luther <k.luther@bgbm.org>
Mon, 16 Nov 2015 11:37:33 +0000 (12:37 +0100)

Trivial merge