From: jenkins <jenkins-int@bgbm.org>
Date: Tue, 12 Jan 2016 09:10:16 +0000 (+0100)
Subject: Merge branch 'hotfix/3.12.2' into develop
X-Git-Tag: 4.0.0^2~197^2~1
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d9e8e24916cbf078aca33e4f74441e94b0b67c55

Merge branch 'hotfix/3.12.2' into develop
---

d9e8e24916cbf078aca33e4f74441e94b0b67c55