Fixed the phpdoc in the DependencyInjection component
merged branch stof/fix_phpdoc (PR #5467)

Commits
-------

05f7f78 Fixed the phpdoc in the DependencyInjection component

Discussion
----------

Fixed the phpdoc in the DependencyInjection component

I was sick of having a warning in my IDE each time I used DefinitionDecorator because of an invalid phpdoc in the constructor, so I took some time and fixed it in the whole DI component.

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

by stof at 2012-09-07T23:09:04Z

The travis failure is unrelated. It is all about some intl failures.

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

by eventhorizonpl at 2012-09-07T23:37:04Z

Reviewed-by: Michal Piotrowski <michal@eventhorizon.pl>

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

by pborreli at 2012-09-08T01:42:26Z

:+1:
=Minor chnage: replaced function by method
merged branch besnikb/2.0 (PR #5482)

Commits
-------

3648abe =Minor chnage: replaced function by method

Discussion
----------

=Minor chnage: replaced function by method
[Profiler]Use the abstract method to get client IP
merged branch armetiz/patch-7 (PR #5530)

Commits
-------

de6658b [Profiler]Use the abstract method to get client IP

Discussion
----------

[Profiler]Use the abstract method to get client IP

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

by armetiz at 2012-09-17T13:37:19Z

This PR is also done for master branch : https://github.com/symfony/symfony/pull/5527
Create CONTRIBUTING.md file for auto-linking in PR's

See: https://github.com/blog/1184-contributing-guidelines
merged branch jmikola/2.0-contributing-file (PR #5533)

Commits
-------

71d8148 Create CONTRIBUTING.md file for auto-linking in PR's

Discussion
----------

Create CONTRIBUTING.md file for auto-linking in PR's

See: https://github.com/blog/1184-contributing-guidelines

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

by kbond at 2012-09-17T17:35:26Z

@jmikola won the race

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

by stof at 2012-09-17T17:37:35Z

and this should be updated according to the discussion on the dev mailing-list

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

by fabpot at 2012-09-17T17:42:28Z

Instead of duplicating the information, I would just linked to the documentation.

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

by jmikola at 2012-09-17T18:42:29Z

I reduced the file to the "Contributing" block from the readme.

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

by lsmith77 at 2012-09-17T19:36:36Z

+1
Fixing config normalisation example in docblock
merged branch richardmiller/fixing_config_docblock (PR #5542)

Commits
-------

1402b42 Fixing config normalisation example in docblock

Discussion
----------

Fixing config normalisation example in docblock

Against 2.0 this time

as per @stof's comments in symfony/symfony-docs#1721

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: -
Fixes the following tickets: -
Todo: -
License of the code: MIT
fixed stringification of array objects in RequestDataCollector (closes #5295)
Improve FilterResponseEvent docblocks Response ref

The type hinting wasn't working in PHPStorm.
merged branch adrienbrault/patch-3 (PR #5572)

Commits
-------

34ca3de Improve FilterResponseEvent docblocks Response ref

Discussion
----------

Improve FilterResponseEvent docblocks Response ref

The type hinting wasn't working in PHPStorm.
hasColorSupport does not take an argument
merged branch h4ck3rm1k3/hasColorSupportFix (PR #5624)

This PR was submitted on branch master but was merged on branch 2.0 instead (closes #5624).

Commits
-------

05eaebf hasColorSupport does not take an argument

Discussion
----------

hasColorSupport does not take an argument

removed the uneeded argument. trivial patch.
fixed undefined variable
merged branch h4ck3rm1k3/Undefined_Security_Http_Firewall_ContextListener3 (PR #5622)

This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #5622).

Commits
-------

538f8c7 fixed undefined variable

Discussion
----------

Undefined security http firewall context listener3

Updated minimal patch,
First patch from static code analysis, $value should be $token I guess. please check.

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

by h4ck3rm1k3 at 2012-09-27T18:00:18Z

I have reverted the admin, i could create a new branch if needed. you can just cherrypick 	 e9bb5a8 that would be easier.

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

by h4ck3rm1k3 at 2012-09-27T18:29:36Z

I squashed it down to one commit. thanks for your patience and help.
Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842
merged branch sasezaki/ZF-4491 (PR #5222)

This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #5222).

Commits
-------

60cd7c0 [HttpFoundation] Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842

Discussion
----------

[HttpFoundation] Support the new Microsoft URL Rewrite Module for IIS 7.0

@see http://framework.zend.com/issues/browse/ZF-4491
@see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842
feel free, merge this or not.

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

by stloyd at 2012-08-09T09:41:18Z

Also this PR should be made against `2.0` branch.

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

by fabpot at 2012-09-18T17:24:26Z

@sasezaki Can you open a PR for the 2.0 branch? Thanks.