symfony/symfony — pull request #2540 by snc (2011-11-02 08:31:00+00:00)
Title: Fixed merge conflict

There was a merge conflict in the composer.json file of the doctrine bridge...