From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Fri, 27 Mar 2015 12:46:41 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.8.0^2~59^2~73
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/47794ee9e5b1db905693e1c5cda86ac93e956ead

merge-update from trunk
---

47794ee9e5b1db905693e1c5cda86ac93e956ead