From: Cherian Mathew <c.mathew@bgbm.org>
Date: Fri, 5 Jun 2015 16:16:57 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 3.7.0~1^2~80
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/6ae694db0d400136902e402079312353d92781be?hp=7e5b1513e55626aac1aff255c101017c69b9cf85

Merge branch 'master' into develop
---