097d573d26
Conflicts: lib/Doctrine/ORM/Configuration.php lib/Doctrine/ORM/Persisters/BasicEntityPersister.php lib/Doctrine/ORM/Persisters/ManyToManyPersister.php