Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 10:11:19 +0000 (12:11 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 10:11:19 +0000 (12:11 +0200)
commit4ac90d615da900439ee877996d1c7528215211ba
tree868b1b5ba1ea7ef96fa1e941bfc7633e9f28633d
parente3bcf9949a000ee3d35875dc200d51cfb60fc70c
parent9f96b16e372b472e73d09db6493c02c1803faae5
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java