merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 16 Oct 2013 07:35:30 +0000 (07:35 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 16 Oct 2013 07:35:30 +0000 (07:35 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.editor/plugin.xml

diff --cc .gitattributes
Simple merge