merge-update from trunk

author Patric Plitzner <p.plitzner@bgbm.org>

Mon, 20 Jul 2015 08:57:42 +0000 (08:57 +0000)

committer Patric Plitzner <p.plitzner@bgbm.org>

Mon, 20 Jul 2015 08:57:42 +0000 (08:57 +0000)
author Patric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Jul 2015 08:57:42 +0000 (08:57 +0000)
committer Patric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Jul 2015 08:57:42 +0000 (08:57 +0000)
diff --cc eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
Simple merge
diff --cc eu.etaxonomy.taxeditor.feature/feature.xml
Simple merge
author	Patric Plitzner <p.plitzner@bgbm.org>
	Mon, 20 Jul 2015 08:57:42 +0000 (08:57 +0000)
committer	Patric Plitzner <p.plitzner@bgbm.org>
	Mon, 20 Jul 2015 08:57:42 +0000 (08:57 +0000)
		1	2
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF	patch \|	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.feature/feature.xml	patch \|	diff1 \|	diff2 \|	blob \| history