Johannes Schmitt 4f585a3d63 Merge branch 'master' of github.com:doctrine/doctrine2 into ValueObjects ... Conflicts: UPGRADE.md lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php		2014-01-04 17:52:32 +01:00
..
Doctrine/ORM	Merge branch 'master' of github.com:doctrine/doctrine2 into ValueObjects	2014-01-04 17:52:32 +01:00
vendor	Removing submodules as of doctrine/doctrine2#570	2013-02-15 18:33:29 +01:00