From: jenkins <jenkins-int@bgbm.org>
Date: Wed, 20 Jan 2016 10:37:37 +0000 (+0100)
Subject: Merge branch 'hotfix/3.12.3' into develop
X-Git-Tag: 4.0.0^2~182
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9fd0c73cedd80b602f5b3e338bc12e418d1008f1

Merge branch 'hotfix/3.12.3' into develop

Conflicts:
	eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
---

9fd0c73cedd80b602f5b3e338bc12e418d1008f1