From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Wed, 6 Jan 2016 16:03:19 +0000 (+0100)
Subject: Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
X-Git-Tag: 4.0.0^2~202
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/05a5c0f87b3270e408a66fbaad3008de145a11c8

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
---

05a5c0f87b3270e408a66fbaad3008de145a11c8