From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 7 Dec 2015 13:31:47 +0000 (+0100)
Subject: Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
X-Git-Tag: 3.12.0^2~32
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9e56f862eb2e623f68c2194c9ccd74862634f4dd

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

9e56f862eb2e623f68c2194c9ccd74862634f4dd