Jordi Boggiano ebc0f8884f Merge remote-tracking branch 'tot-ra/patch-2' ... Conflicts: src/Composer/Downloader/ArchiveDownloader.php		2012-08-11 18:45:38 +02:00
..
Composer	Merge remote-tracking branch 'tot-ra/patch-2'	2012-08-11 18:45:38 +02:00
bootstrap.php	php-cs-fixer magic	2012-05-22 12:07:08 +02:00