merge-update from trunk

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

Mon, 4 Aug 2014 10:08:37 +0000 (10:08 +0000)

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

Mon, 4 Aug 2014 10:08:37 +0000 (10:08 +0000)
author Patric Plitzner <p.plitzner@bgbm.org>
Mon, 4 Aug 2014 10:08:37 +0000 (10:08 +0000)
committer Patric Plitzner <p.plitzner@bgbm.org>
Mon, 4 Aug 2014 10:08:37 +0000 (10:08 +0000)
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
Simple merge
author	Patric Plitzner <p.plitzner@bgbm.org>
	Mon, 4 Aug 2014 10:08:37 +0000 (10:08 +0000)
committer	Patric Plitzner <p.plitzner@bgbm.org>
	Mon, 4 Aug 2014 10:08:37 +0000 (10:08 +0000)