merge-update from trunk

author Patric Plitzner <p.plitzner@bgbm.org>

Mon, 2 Dec 2013 12:00:52 +0000 (12:00 +0000)

committer Patric Plitzner <p.plitzner@bgbm.org>

Mon, 2 Dec 2013 12:00:52 +0000 (12:00 +0000)
author Patric Plitzner <p.plitzner@bgbm.org>
Mon, 2 Dec 2013 12:00:52 +0000 (12:00 +0000)
committer Patric Plitzner <p.plitzner@bgbm.org>
Mon, 2 Dec 2013 12:00:52 +0000 (12:00 +0000)
diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
Simple merge
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
Simple merge
author	Patric Plitzner <p.plitzner@bgbm.org>
	Mon, 2 Dec 2013 12:00:52 +0000 (12:00 +0000)
committer	Patric Plitzner <p.plitzner@bgbm.org>
	Mon, 2 Dec 2013 12:00:52 +0000 (12:00 +0000)
		1	2
eu.etaxonomy.taxeditor.editor/plugin.xml	patch \|	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java	patch \|	diff1 \|	diff2 \|	blob \| history