merge trunk into 3.6 branch
authorAndreas M��ller <a.mueller@bgbm.org>
Tue, 2 Jun 2015 12:43:24 +0000 (12:43 +0000)
committerAndreas M��ller <a.mueller@bgbm.org>
Tue, 2 Jun 2015 12:43:24 +0000 (12:43 +0000)
commitbb7cf1c5559896c0ab131e63415e0455245f610f
tree37601de9e6dc61b80ec6410591fe561e0328aeb7
parent442c5a7fb6519f4008457fecc50afce73864e6d1
parent9fa59539965df3bd469bc7e4cdb0ae1334f4bc71
merge trunk into 3.6 branch
.gitattributes
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImpl.java