Merge branch 'hotfix/3.12.3' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:37:37 +0000 (11:37 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:37:37 +0000 (11:37 +0100)
commit9fd0c73cedd80b602f5b3e338bc12e418d1008f1
treec772890d06555f1c70feb4f644d93423ceeb3ed5
parent749a9d9f86be93538e01cf0f62f42d65c562b41a
parent765dfea078021365551c75982cc54b404c77873b
Merge branch 'hotfix/3.12.3' into develop

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