Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 25 Aug 2015 08:21:25 +0000 (10:21 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 25 Aug 2015 08:21:25 +0000 (10:21 +0200)

Trivial merge