From: U-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Date: Wed, 26 Aug 2015 10:30:07 +0000 (+0200)
Subject: Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
X-Git-Tag: 3.8.0^2~40
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/48f674499660b930ee7bb5d7b3a7e4249d96fa0b

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

48f674499660b930ee7bb5d7b3a7e4249d96fa0b