merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 8 Sep 2014 14:00:23 +0000 (14:00 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 8 Sep 2014 14:00:23 +0000 (14:00 +0000)
commitf1f0943488d3f5c4dc84b910467d19c95120d460
treecae20bb33ecfc64354b776a465ef73d18d99b826
parentc71d712f63ed1caed3ddc96281753095ee2cc262
parent5da1d38cd45217b050b2e9b87114e5e132239b64
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/plugin.xml