[Yaml] fixed a test when iconv is not installed
[HttpKernel] Fixed wache vary write (fixes #3896).
merged branch jfsimon/issue-3896 (PR #4029)

Commits
-------

686653a [HttpKernel] Fixed wache vary write (fixes #3896).

Discussion
----------

[HttpKernel] Fixed cache vary write (fixes #3896).

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #3896

Same as https://github.com/symfony/symfony/pull/4001, but for write method.
[FrameworkBundle] Monitor added/removed translations files in dev (fix #3653)
merged branch vicb/transaltion_monitor (PR #4036)

Commits
-------

7ddc8cb [FrameworkBundle] Monitor added/removed translations files in dev (fix #3653)

Discussion
----------

[FrameworkBundle] Monitor added/removed translations files in dev

fix #3653

---------------------------------------------------------------------------

by Koc at 2012-04-20T14:09:55Z

maybe you also can fix #971 ?
[TwigBundle] added missing entry in the XSD schema
Add mongodb session storage

Some changes based on @stof and @stloyd suggestions

Some changes based on @vicb suggestions

Some changes based on @vicb suggestions

Add changes
[HttpFoundation] removed useless else clause in Request::getPort() method.
merged branch hhamon/request_getport_cleanup (PR #4052)

Commits
-------

6dddb6b [HttpFoundation] removed useless else clause in Request::getPort() method.

Discussion
----------

Request getport cleanup

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
fix hanging of unit tests on Windows
fix php5.4 problem
[2.0][Component][ClassLoader] cs
[2.1][CHANGELOG]: Finder, Comparator new features
[2.1][Component][ClassLoader] cs
http_build_query fix
http_build_query fix
http_build_query fix
merged branch gajdaw/2_1_changelog (PR #4074)

Commits
-------

86cf3fd [2.1][CHANGELOG]: Finder, Comparator new features

Discussion
----------

[2.1][CHANGELOG]: Finder, Comparator new features

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
merged branch gajdaw/2_0_component_classloader_cs (PR #4072)

Commits
-------

54ec687 [2.0][Component][ClassLoader] cs

Discussion
----------

[2.0][Component][ClassLoader] CS

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
merged branch gajdaw/2_1_component_classloader_cs (PR #4073)

Commits
-------

bc8855e [2.1][Component][ClassLoader] cs

Discussion
----------

[2.1][Component][ClassLoader] cs

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -

---------------------------------------------------------------------------

by fabpot at 2012-04-23T06:18:26Z

Can you please remove the changes you have already made in the other PR as I merge 2.0 into master regularly. Then, you will need to squash you commits to avoid any conflict when merging will occur. Thanks.

---------------------------------------------------------------------------

by gajdaw at 2012-04-23T06:50:58Z

I hope that's it.