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)
commit0fd1fa8745c67d68a3ed55e03ac1ba16664b1241
tree17e244c7188ea465173860a8940345483ac9553a
parenta9f32ef0d94675a7ebc7160dcef25cff8a3b3a15
parent1828f87adf488102995cba45f933e4ee55ef5a3f
Merge branch 'release/3.7.0'

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