From: jenkins <jenkins-int@bgbm.org>
Date: Thu, 16 Jul 2015 08:45:33 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 3.7.0~3^2~15
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/4cee564ddb2963a87bf2c1eba3e19ec2c22c7f12

Merge branch 'master' into develop
---

4cee564ddb2963a87bf2c1eba3e19ec2c22c7f12