From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Mon, 29 Jun 2015 13:25:18 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.8.0^2~59^2~47
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/3419670f29743617b6f572f9e8485612ea8216f6

merge-update from trunk
---

3419670f29743617b6f572f9e8485612ea8216f6