From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Wed, 20 Jan 2016 08:44:29 +0000 (+0100)
Subject: Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
X-Git-Tag: 4.0.0^2~183
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/749a9d9f86be93538e01cf0f62f42d65c562b41a

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

749a9d9f86be93538e01cf0f62f42d65c562b41a