Updated to symfony 2.5
Very minor, spelling mistake in DocBlock.
Merge pull request #4094 from ronnied/master

Very minor, spelling mistake in DocBlock.
Fix conflicts.