Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 3 Jul 2015 10:09:47 +0000 (12:09 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 3 Jul 2015 10:09:47 +0000 (12:09 +0200)
commit85cfbf6f69b400dd42a078c597f4a1424bca8cae
tree6efbe0da84a741c6effe59d0b550e10504f03497
parentbb1997d075f1f8efc3ed485c637099c5922aa657
parent2c5de69d043e65829a96debd480741147aff2f3a
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/TaxonEditorInput.java
eu.etaxonomy.taxeditor.application/.classpath
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java