Mathieu De Zutter 318b23097b Don't load uninitialized proxies after merging. ... Previous patch avoided initialization of proxies before merging, mainly to fix a bug with merging. However, later on, doctrine tries again to load the proxy. This is unnecessary and thus has been removed. This way, a round trip to the database is saved.		2015-01-16 20:54:15 +01:00
..
Doctrine/ORM	Don't load uninitialized proxies after merging.	2015-01-16 20:54:15 +01:00
vendor	Removing submodules as of doctrine/doctrine2#570	2013-02-15 18:33:29 +01:00