Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 15 Jun 2015 07:49:29 +0000 (09:49 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 15 Jun 2015 07:49:29 +0000 (09:49 +0200)

Trivial merge