From: Cherian Mathew <c.mathew@bgbm.org>
Date: Thu, 2 Jul 2015 09:39:24 +0000 (+0200)
Subject: Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
X-Git-Tag: remoting-3.9.0~106
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/487e442c0c7d6f6a114d11cd3a2494f6ea9094f9

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
---

487e442c0c7d6f6a114d11cd3a2494f6ea9094f9