Added named encoders to EncoderFactory
Merge conflicts
Merge branch 'master' of https://github.com/tamirvs/symfony
Added upgrade info for #9601
minor #9972 Upgrade File for 2.5 (Danez)

This PR was merged into the 2.5-dev branch.

Discussion
----------

Upgrade File for 2.5

Added upgrade info for #9601, as this pr might break code which overwrites this method and also to respect symfony/symfony-docs#3439.

Commits
-------

fefcf41 Added upgrade info for #9601
Merge branch 'master' of https://github.com/symfony/symfony