From: U-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Date: Tue, 18 Aug 2015 12:45:59 +0000 (+0200)
Subject: Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
X-Git-Tag: 3.8.0^2~43^2~18
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/6950e78357270c053c53956ca46876ea7193e642

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

6950e78357270c053c53956ca46876ea7193e642