Jordi Boggiano 9a806658d6 Merge remote-tracking branch 'vuhl/master' ... Conflicts: src/Composer/Factory.php		2013-10-11 20:06:34 -03:00
..
Composer	Merge remote-tracking branch 'vuhl/master'	2013-10-11 20:06:34 -03:00
bootstrap.php	Add parallel build to travis script	2013-09-25 10:23:48 +02:00
complete.phpunit.xml	Rename tests/phpunit.xml.dist for clarity	2012-06-25 18:59:41 +02:00