From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 16 Jul 2015 12:11:39 +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~30
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5b999d8fc89e66f24e1ec3f82ca353ebc9dd60cb?hp=-c

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

5b999d8fc89e66f24e1ec3f82ca353ebc9dd60cb