Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Thu, 16 Jul 2015 12:11:39 +0000 (14:11 +0200)
committerKatja Luther <k.luther@bgbm.org>
Thu, 16 Jul 2015 12:11:39 +0000 (14:11 +0200)

Trivial merge