merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 25 Aug 2014 11:53:31 +0000 (11:53 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 25 Aug 2014 11:53:31 +0000 (11:53 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java

diff --cc .gitattributes
Simple merge