merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 10:45:33 +0000 (10:45 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 10:45:33 +0000 (10:45 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.editor/plugin.xml

diff --cc .gitattributes
Simple merge