merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 27 Mar 2015 08:32:03 +0000 (08:32 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 27 Mar 2015 08:32:03 +0000 (08:32 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF

diff --cc .gitattributes
Simple merge