make scheme and method requirements first-class citizen in Route
added scheme and method setter in RouteCollection
made schemes and methods available in YamlFileLoader
made schemes and methods available in XmlFileLoader

it uses an attribute list instead of multiple scheme/method elements that I also experimented with
[Serializer] Allow options to be passed to SerialiizerInterface#serialize and #unserialize. Thsee options are available to all encoders/decoders/normalizers that implement SerializerAwareInterface.
Fix CS issues, removed global options
Rename $options to $context, as it makes the intent much more clear.
Added context to JsonEncoder
[HttpKernel][Monolog] Add PSR-3 support to the LoggerInterface
[HttpKernel] Clarify misleading comment in ExceptionListener
merged branch igorw/exception-listener-comment (PR #6611)

This PR was squashed before being merged into the 2.1 branch (closes #6611).

Commits
-------

bde5a7f [HttpKernel] Clarify misleading comment in ExceptionListener

Discussion
----------

[HttpKernel] Clarify misleading comment in ExceptionListener

Regression from 295860dfaf474604f242198ee487bc8c8045b8ae.

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

by fabpot at 2013-01-08T09:02:53Z

The comment is right. Returning without a Response will re-throw the exception (in HttpKernel).

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

by staabm at 2013-01-08T11:00:36Z

so the comment should point out, that the httpkernel will rethrow the exception in that case?

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

by igorw at 2013-01-08T13:38:43Z

I missed that on the commit I linked. I've updated the patch to re-introduce the comment but clarify that `throw` is in HttpKernel.
removed the .gitattributes files (closes #6605, reverts #5674)
[Monolog] Mark old non-PSR3 methods as deprecated
[HttpKernel] Extend psr/log's NullLogger class
Remove use of deprecated HttpKernel LoggerInterface
Show PHP SAPI in WDT
Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.

Optionally use the new IntlDateFormatter::setTimeZone() method if it exists.
Fix version_compare() calls for PHP 5.5.

Until PHP 5.5 hits beta, the version number for Git builds is still 5.5.0-dev,
which is less than 5.5.0alpha1 according to version_compare(). This means that
the branches for 5.5 aren't being executed on 5.5 snapshots at present.
moved the logic from HttpKernel in FrameworkBundle to the HttpKernel component
[TwigBridge] added a render_* function to ease usage of custom rendering strategies

Here is the code you need to write when using the regular render
function for an ESI strategy:

    {{ render(path('path'), { strategy: 'esi' })
}}

And the same with the new render_* function:

    {{ render_esi(path('path')) }}