Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Mon, 14 Sep 2015 14:37:41 +0000 (16:37 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Mon, 14 Sep 2015 14:37:41 +0000 (16:37 +0200)
commit667025a545eb8a1553ec97e1bd3d4fe3a0101f36
tree37e23d1184ba1e9bfdde1295d057a03ec69305af
parentc9f13bde09d3c996809b213f1bddf3c14d803536
parent17653afc51470d5125287a1d2cdfc024ebaeeb1e
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
eu.etaxonomy.taxeditor.application/.classpath
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java