Merge branch 'release/3.7.0'
authorjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 15:56:02 +0000 (17:56 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 15:56:02 +0000 (17:56 +0200)
commita9f32ef0d94675a7ebc7160dcef25cff8a3b3a15
tree32cf46c57b8ddc23b67d40553ed967a7dbac5af7
parent902d787562b17457405cc000c06689895a304ffe
parent16cd938f580b62d7fff661b41155915fe3b04627
Merge branch 'release/3.7.0'

Conflicts:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.feature/feature.xml
pom.xml