merged branch Tobion/patch-6 (PR #4248)

Commits
-------

9af91a3 add composer to gitignore in 2.0

Discussion
----------

add composer to gitignore in 2.0

it was missing in 2.0 (so switching from master to 2.0 made these files appear as new)

---------------------------------------------------------------------------

by travisbot at 2012-05-10T13:20:31Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1294729) (merged 9af91a3 into 68eca0f).

.gitignore

@@ -1,3 +1,5 @@
 phpunit.xml
+composer.lock
+composer.phar
 autoload.php
 /vendor/