Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 7 Dec 2015 13:31:47 +0000 (14:31 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 7 Dec 2015 13:31:47 +0000 (14:31 +0100)

Trivial merge