merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 2 Dec 2013 12:00:52 +0000 (12:00 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 2 Dec 2013 12:00:52 +0000 (12:00 +0000)
commit3d6c9acc014b267446568f6c95cbae60dff59dd3
tree9802c5ae50e7e4ff8adbee962f0c414b5e0e87b1
parent80273dd5a234274d182975253bdaa1a7bc8d133b
parent97e10b7ca8041467c6a72e9cf76a23165886c2cd
merge-update from trunk
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java