Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 12 Jan 2016 15:46:49 +0000 (16:46 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 12 Jan 2016 15:46:49 +0000 (16:46 +0100)

Trivial merge