From: jenkins <jenkins-int@bgbm.org>
Date: Tue, 12 Jan 2016 09:10:14 +0000 (+0100)
Subject: Merge branch 'hotfix/3.12.2'
X-Git-Tag: 3.12.2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/0e7f758d1a7791a055f1799d922e88dc4b587bb9?hp=0f343e3a52fc38dc2ba612c8e758fbfbc73c159b

Merge branch 'hotfix/3.12.2'
---