hibernate-orm/hibernate-entitymanager
Gail Badner 9d67bf3218 HHH-9106 : Merging multiple representations of the same entity (logging)
(cherry picked from commit 31bcb0ea0a73c32bbb430ac6eed54005f01a40f2)

Conflicts:
	hibernate-core/src/test/resources/log4j.properties
2014-07-03 12:55:29 -07:00
..