Alexander 04635ad4ff Merge remote-tracking branch 'upstream/master' into DDC-551 ... Conflicts: lib/Doctrine/ORM/Persisters/ManyToManyPersister.php lib/Doctrine/ORM/Persisters/OneToManyPersister.php		2011-12-05 21:53:34 +01:00
..
Doctrine/ORM	Merge remote-tracking branch 'upstream/master' into DDC-551	2011-12-05 21:53:34 +01:00
vendor	DDC-1448 - Add support for ObjectManagerAware interface and PersistentObject in ORM	2011-11-19 13:06:24 +01:00