From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Tue, 5 Aug 2014 12:12:40 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.8.0^2~59^2~133
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/083ce01ad96a041672c17ecb7c083305651ef3a2

merge-update from trunk
---

083ce01ad96a041672c17ecb7c083305651ef3a2