Jordi Boggiano 4a6ae454c2 Merge remote-tracking branch 'dpb587/multiple-repos' ... Conflicts: src/Composer/Factory.php src/Composer/Package/Loader/RootPackageLoader.php tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php		2012-06-23 12:09:31 +02:00
..
Composer/Test	Merge remote-tracking branch 'dpb587/multiple-repos'	2012-06-23 12:09:31 +02:00
bootstrap.php	Regroup bootstrapers	2012-03-15 13:14:02 +01:00
phpunit.xml.dist	Add slow tests to slow group, excluded by default except for travis	2012-05-06 15:10:13 +02:00