merged 2.0
Refactored profiler storage tests to share some code.
Return profiler results sorted by time in descending order like in the other implementations.
Overwrite the profile data if the token already exists like in the other implementations.
SqliteProfilerStorage fix
[Routing] fixed incorrect grammar in docblock
Removed version field
merged branch shieldo/patch-2 (PR #3459)

Commits
-------

54f1a94 [Routing] fixed incorrect grammar in docblock

Discussion
----------

[Routing] fixed incorrect grammar in docblock
merged branch pulzarraider/fix_profiler_test (PR #3455)

Commits
-------

e8281cf SqliteProfilerStorage fix

Discussion
----------

[HttpKernel] SqliteProfilerStorage fix

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
merged branch pcampr/patch-1 (PR #3448)

Commits
-------

8e90903 fixed small typo in UPGRADE-2.1.md

Discussion
----------

fixed small typo in UPGRADE-2.1.md

just replaced endforeach by endfor in UPGRADE-2.1.md in sample code
merged branch Seldaek/router_def (PR #3437)

Commits
-------

09b1bd5 [HttpKernel] Remove the _controller since it is not a route parameter part of the url

Discussion
----------

[HttpKernel] Remove the _controller since it is not a route parameter part of the URL

There is no reason for the _controller to be there, the whole idea behind this _route_params thing was to help re-generating the current page's URL, you can easily grab the _route + _route_params and reconstruct it without having lots of garbage as query parameters like `?_controller=Foo::..`

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

by fabpot at 2012-02-24T10:29:01Z

I agree but isn't it a BC break? I mean, someone may rely on `_controller` in his code.

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

by Seldaek at 2012-02-24T11:45:46Z

This is a new 2.1 feature AFAIK so no it's not breaking anything. If _controller is deemed necessary then we should add it on the attributes, but not in the _route_params IMO.

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

by stof at 2012-02-24T13:32:41Z

indeed, ``_route_params`` is new in 2.1
merged branch Seldaek/fixtests (PR #3443)

Commits
-------

d95d63d Ignore destructive memcached tests by default

Discussion
----------

Ignore destructive memcached tests by default

Follow up for #3438
merged branch kriswallsmith/wdt/no-session-fix (PR #3444)

Commits
-------

95ec4eb [WebProfilerBundle] fixed session assumption

Discussion
----------

[WebProfilerBundle] fixed session assumption

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

[![Build Status](https://secure.travis-ci.org/kriswallsmith/symfony.png?branch=wdt/no-session-fix)](http://travis-ci.org/kriswallsmith/symfony)
merged branch dlsniper/patch-1 (PR #3447)

Commits
-------

eb58dd1 Removed useless parameter from Memcached::set()

Discussion
----------

Removed useless parameter from Memcached::set() which makes users unable to set session expiry time.

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

The parameter count is wrong so it makes setting session expiration useless.

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

by stof at 2012-02-25T16:06:16Z

Already fixed in 15c6ba93f

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

by stof at 2012-02-25T16:06:46Z

ah sorry, it was the profiler storage
merged branch Seldaek/composer_alias (PR #3457)

Commits
-------

bafcaaf Removed version field
f9d9dc7 Add branch-alias for composer

Discussion
----------

Add branch-alias for composer

This should restore the 2.1-dev version (as an alias of dev-master) so that `2.*` or `2.1.*` constraints work again. I'll adjust packagist soon to also display those aliases.
merged branch snc/session-handler (PR #3436)

Commits
-------

9c8a283 Some \SessionHandlerInterface related documentation updates
9b2de81 Fixed \SessionHandlerInterface in DbalSessionStorage

Discussion
----------

Some \SessionHandlerInterface related updates

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

by snc at 2012-02-23T20:01:51Z

I checked the `Locale` stub in the documentation and it looks like the `\` is not prefixed, so I'll change this, too.

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

by drak at 2012-02-24T07:40:39Z

We really need some tests for the bridge classes, even if they stubs which cause the compiler to at least parse the class, would pick up refactorings like this.
[HttpFoundation][Session] Fix bug in PDO Session Storage with SQLSRV making assumptions about parameters with length being OUTPUT not INPUT parameters.
merged branch beberlei/PdoSessionStorageSqlSrvFix (PR #3461)

Commits
-------

dc2d5a0 [HttpFoundation][Session] Fix bug in PDO Session Storage with SQLSRV making assumptions about parameters with length being OUTPUT not INPUT parameters.

Discussion
----------

[HttpFoundation][Session] PDO session storage sql srv fix

...ing assumptions about parameters with length being OUTPUT not INPUT parameters.

See also http://social.msdn.microsoft.com/Forums/en/sqldriverforphp/thread/c7431849-8594-4da2-bef6-8702b72391cc

Addtionally PDO Session Storage has no tests on either master or 2.0, i will provide a PR with a basic coverage in a seperate commit.
[Session] Add Test for PDO Session Storage with SQLite in Memory DB.
merged branch beberlei/PDOSessionTest (PR #3462)

Commits
-------

5a6ce20 [Session] Add Test for PDO Session Storage with SQLite in Memory DB.

Discussion
----------

[Session] PDO Session Storage tests

The PDO Session storage was untested previously.

This test is for the 2.0 API. The methods names all changed in the master branch and have to be adjusted when 2.0 is merged into master.