From: Cherian Mathew <c.mathew@bgbm.org>
Date: Thu, 28 May 2015 11:14:15 +0000 (+0200)
Subject: Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
X-Git-Tag: 3.6.0~24
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/7509c9f33939429d74ef835f26791e57020bbc9a

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
---

7509c9f33939429d74ef835f26791e57020bbc9a