Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 10 Sep 2015 15:42:26 +0000 (17:42 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 10 Sep 2015 15:42:26 +0000 (17:42 +0200)
commit467d468b148490ebdf7f95f8b8dffb40a850a4f9
tree49eb2eb3e6bac1ebe1d3ad9591099ec4496395d9
parentfeb6d41a1ded20c99f02efa751a40b67698061fd
parent627fcabe58cff70d6e6a1d146cc4777c2797164d
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java