From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 12 Jan 2016 15:46:49 +0000 (+0100)
Subject: Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
X-Git-Tag: 4.0.0^2~197
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/677171459049bf7e74ec595843240758de8f230a

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

677171459049bf7e74ec595843240758de8f230a