Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 6 Jan 2016 16:03:19 +0000 (17:03 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 6 Jan 2016 16:03:19 +0000 (17:03 +0100)

Trivial merge