Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Mon, 29 Feb 2016 12:43:59 +0000 (13:43 +0100)
committerKatja Luther <k.luther@bgbm.org>
Mon, 29 Feb 2016 12:43:59 +0000 (13:43 +0100)

Trivial merge