merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 26 Nov 2014 14:37:34 +0000 (14:37 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 26 Nov 2014 14:37:34 +0000 (14:37 +0000)
commit26abde2f73fa0e646d8b03724ca7c034a6482728
tree1e9415657f2a397a669514f749f770ce1cb2f2a5
parente4900d3e1e20808f9fcd40ef5125298e5773aa9b
parent3177a94904d04cfde544817ccd30060bbbf70368
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.editor/plugin.xml