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)
commitb16cf84f2d81b063efd493f48591db07d7be19aa
tree42d3de77b1aaefef77ba1aada72826e42eb84c88
parentd400a8b186465463fe389f644f018871345308db
parent748e28eed13f595538c60d9523a97a65ab431661
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF