Merge branch 'ticket-5066' into develop
authorAndreas Müller <a.mueller@bgbm.org>
Fri, 9 Oct 2015 12:38:52 +0000 (14:38 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Fri, 9 Oct 2015 12:38:52 +0000 (14:38 +0200)
commitd8fe1030de3bbd1f1961e7c8af5a5fd68e2c2428
treead0d95e25dd8dd1b72e985691cf050a5dafbefa3
parent09081d2b81103297c802c8e2f3f97b175e03720c
parenteb9a6442f391fa74f07ab174fe40a741507bcf1d
Merge branch 'ticket-5066' into develop

Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java