Merge branch 'release/3.7.0'
authorjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 16:35:53 +0000 (18:35 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 16:35:53 +0000 (18:35 +0200)
Conflicts:
eu.etaxonomy.taxeditor.feature/feature.xml


Trivial merge