Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 24 Jun 2015 12:19:58 +0000 (14:19 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 24 Jun 2015 12:19:58 +0000 (14:19 +0200)

Trivial merge