Pádraic Brady 81b86acc53 Merge branch 'master' of github.com:composer/composer into tls-config ... Conflicts: src/Composer/Util/RemoteFilesystem.php		2014-02-27 17:56:32 +00:00
..
Composer	Merge branch 'master' of github.com:composer/composer into tls-config	2014-02-27 17:56:32 +00: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