merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Jul 2015 08:57:42 +0000 (08:57 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Jul 2015 08:57:42 +0000 (08:57 +0000)
commita10ceea8a0b478a7492eba23f45198ad9911137a
tree32603e75e742d435c417a858c340171fd3d036ec
parenta5e0f609a05863661f76faead66f0be00e47ecf0
parent67de2353d55ce0c8a93ae6caa019a0299985baf7
merge-update from trunk
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.feature/feature.xml