From: jenkins <jenkins-int@bgbm.org>
Date: Wed, 15 Jul 2015 16:35:53 +0000 (+0200)
Subject: Merge branch 'release/3.7.0'
X-Git-Tag: 3.7.0~5
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/0fd1fa8745c67d68a3ed55e03ac1ba16664b1241

Merge branch 'release/3.7.0'

Conflicts:
	eu.etaxonomy.taxeditor.feature/feature.xml
---

0fd1fa8745c67d68a3ed55e03ac1ba16664b1241