Merge branch 'hotfix/3.12.4' into develop
authorjenkins <jenkins-int@bgbm.org>
Mon, 15 Feb 2016 09:31:03 +0000 (10:31 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 15 Feb 2016 09:31:03 +0000 (10:31 +0100)
commit70b69a8ce67982786e01a6e1b1281a8be38871b3
treee5953193f08deab8a2a3990a96b850a2ebe3f851
parentbbe794c6ca8b358489861777a8119348ef7d05e6
parent984d07152d600bb0ca0c6f654f49027ef90523a3
Merge branch 'hotfix/3.12.4' into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java - resolved
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java - UNRESOLVED!!!!!
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java