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)
commit47f905cbfbf1066fed4d785ee10e8cb93964a640
treea6a3b58c8c87554c42fa429fbefb6a16ace3a005
parentb12b0460ff77cb4aad96dfaf530020c932f32d8b
parenta9fd44dedb18054cc5b04ed8d795c16b93ca9a13
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java