Bastian Hofmann 4b3fc2b5fa Merge branch 'master' of git://github.com/composer/composer ... Conflicts: src/Composer/Repository/PearRepository.php		2012-05-06 14:42:13 +02:00
..
Composer	Merge branch 'master' of git://github.com/composer/composer	2012-05-06 14:42:13 +02:00
bootstrap.php	Fix line endings	2012-04-19 21:56:05 +02:00