From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 16 Nov 2015 15:51:20 +0000 (+0100)
Subject: Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
X-Git-Tag: 3.12.0^2~62
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a187717bf44c9c9881860383869d39fb37904662

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

a187717bf44c9c9881860383869d39fb37904662