f0ed4e87b5
# Conflicts: # tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php
# Conflicts: # tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php