Alexander be48821e86 Merge remote-tracking branch 'origin/master' into DDC-551 ... Conflicts: lib/Doctrine/ORM/Persisters/BasicEntityPersister.php lib/Doctrine/ORM/Query.php		2011-11-23 22:43:42 +01:00
..
Doctrine/ORM	Merge remote-tracking branch 'origin/master' into DDC-551	2011-11-23 22:43:42 +01:00
vendor	DDC-1448 - Add support for ObjectManagerAware interface and PersistentObject in ORM	2011-11-19 13:06:24 +01:00