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)
commit0055584abdf9288a4d9170bfe683ffd8dd589451
treecfb9c6c634fee30e342f05479d5cc43b7cf9639d
parent6829d79d5cfa9a3188393de1d9fb3b6b5ec10660
parentc01d683c40d8406b42094b7482b9000f6442c64f
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.editor/plugin.xml