merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Mar 2015 13:26:52 +0000 (13:26 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Mar 2015 13:26:52 +0000 (13:26 +0000)
commitd400a8b186465463fe389f644f018871345308db
tree0a28efabbb061e79a48687510de5dc79984e13f5
parentf0010264a20499c7aa993c6bc65bec44d7c1e8a5
parent52eafbd78bfb7192170d3cc2ecdac68601caf7a1
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.editor/plugin.xml