Update http_cache.rst - hint at whitelisting 127.0.0.1 if using HTTP Cache solution
minor #874 Update http_cache.rst - hint at whitelisting 127.0.0.1 if using HTTP Cache solution (alcohol)

This PR was squashed before being merged into the 1.2.x-dev branch (closes #874).

Discussion
----------

Update http_cache.rst - hint at whitelisting 127.0.0.1 if using HTTP Cache solution

Took me quite a while to realise this; this simple tip might help others save that time :-)

Commits
-------

4b1ae82 Update http_cache.rst - hint at whitelisting 127.0.0.1 if using HTTP Cache solution
Updated year in License
minor #888 Updated year in License (danielcsgomes)

This PR was merged into the 1.0 branch.

Discussion
----------

Updated year in License

Commits
-------

1e543d2 Updated year in License
Merge branch '1.0' into 1.1

* 1.0:
  Updated year in License
Merge branch '1.1'

* 1.1:
  Updated year in License
Made Silex comaptible with Symfony 2.5
Enabled testing on Symfony 2.5 on Travis
TranslationServiceProvider replaced translator.messages by translator.domains.

- changed in commit 7C496D
bug #892 TranslationServiceProvider replaced translator.messages by translator.domains. (FGM)

This PR was submitted for the 1.0.x-dev branch but it was merged into the 1.0 branch instead (closes #892).

Discussion
----------

TranslationServiceProvider replaced translator.messages by translator.domains.

- changed in commit 7C496D

Commits
-------

72b1ad9 TranslationServiceProvider replaced translator.messages by translator.domains.
Merge branch '1.0' into 1.1

* 1.0:
  TranslationServiceProvider replaced translator.messages by translator.domains.
Merge branch '1.1'

* 1.1:
  TranslationServiceProvider replaced translator.messages by translator.domains.
minor #891 Made Silex compatible with Symfony 2.5 (stof)

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Made Silex compatible with Symfony 2.5

Commits
-------

2c12d84 Enabled testing on Symfony 2.5 on Travis
2a7f3db Made Silex comaptible with Symfony 2.5
Update phpDoc for ControllerCollection
minor #890 Update phpDoc for ControllerCollection (Kilte)

This PR was squashed before being merged into the 1.2.x-dev branch (closes #890).

Discussion
----------

Update phpDoc for ControllerCollection

__call() forwards method-calls to Route, but returns instance of ControllerCollection.
 Added the listing Route's methods, so that IDEs know they are valid.

Commits
-------

53b3a35 Update phpDoc for ControllerCollection