merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 29 Jun 2015 12:39:34 +0000 (12:39 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 29 Jun 2015 12:39:34 +0000 (12:39 +0000)
commit501725be27949a85cc33dfab97c2e9844edbd291
tree8c8f15fcd2c871a0285a12a512a39b388ce9554c
parent42358e6e634ee1d9078002128707de973ba13ab2
parent72060b99ac9524f9f2b4d8d52c04250c039eeeae
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF