Alexander 097d573d26 Merge branch 'master' into DDC-551 ... Conflicts: lib/Doctrine/ORM/Configuration.php lib/Doctrine/ORM/Persisters/BasicEntityPersister.php lib/Doctrine/ORM/Persisters/ManyToManyPersister.php		2011-10-14 12:33:39 +02:00
..
ORM	Merge branch 'master' into DDC-551	2011-10-14 12:33:39 +02:00