symfony/symfony — pull request #7938 by fabpot (2013-05-05 16:51:17+00:00)
Title: [Security] fixed wrong merge (refs #4776)

| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | n/a
| License | MIT
| Doc PR | n/a

This fixes a bad conflict resolution when #4776 was merged.