From: jenkins <jenkins-int@bgbm.org>
Date: Thu, 16 Jul 2015 09:11:32 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 3.7.0~2^2~13
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b4bf78facca8c9d1f075c882d53487c3cd7bba41

Merge branch 'master' into develop
---

b4bf78facca8c9d1f075c882d53487c3cd7bba41