Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 20 Jan 2016 08:44:29 +0000 (09:44 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 20 Jan 2016 08:44:29 +0000 (09:44 +0100)

Trivial merge