Merge branch 'remoting-4.0' into develop
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 22 Sep 2015 16:44:14 +0000 (18:44 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 22 Sep 2015 16:44:14 +0000 (18:44 +0200)
commit28f75e331b82490d677298d62fd494c295a6cd69
tree8784de5e5204d4e9f63e9ea87ffc00d34cab571b
parent7f9465d2a65f7ecaa010d87e41741938472f3473
parentfbedcb2325afa80c8e778152e0553c3767fb14a1
Merge branch 'remoting-4.0' into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionToOtherTaxonHandler.java
eu.etaxonomy.taxeditor.navigation/plugin.xml
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveFactualDataHandler.java