merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 23 Sep 2014 13:31:07 +0000 (13:31 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 23 Sep 2014 13:31:07 +0000 (13:31 +0000)
commitf65a33049e16dc2c1fa15327657fb9326d067709
treeec9553c0be8440a43ac1f5e7c1150a26c9bd762c
parentf1f0943488d3f5c4dc84b910467d19c95120d460
parente28d0ce18f4fca911f3d6e0cb250d306b1fc80d0
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.editor/.project
eu.etaxonomy.taxeditor.editor/plugin.xml