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
Rename $key parameter to $name for consistency
merged branch aderuwe/patch-1 (PR #5505)

Commits
-------

c2f8563 Rename $key parameter to $name for consistency

Discussion
----------

[DependencyInjection] Rename $key parameter to $name for consistency

When I worked on #5478, I noticed an inconsistency in parameter naming in the ```ParameterBag#remove``` method. This PR brings things in line with the rest of the class.

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
Fixing incorrect word in twig:lint command description
merged branch richardmiller/fixing_twig_lint_description (PR #5523)

Commits
-------

2bcb6f2 Fixing incorrect word in twig:lint command description

Discussion
----------

[TwigBundle} Fixing incorrect word in twig:lint command description
Typo fix
[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
merged branch AndreyChernykh/2.1 (PR #5524)

Commits
-------

580d5a7 Typo fix

Discussion
----------

Typo fix

Typo fix in "Range" validator constraints.
Added Bulgarian translation

Bulgarian translation of validator messages
merged branch RoumenMe/translation-2.1 (PR #5534)

Commits
-------

3269014 Added Bulgarian translation

Discussion
----------

Added Bulgarian translation

Bulgarian translation of validator messages
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
merged 2.0
Merge branch '2.1'

* 2.1:
  Create CONTRIBUTING.md file for auto-linking in PR's
  Added Bulgarian translation
  [Profiler]Use the abstract method to get client IP
  Typo fix
  Fixing incorrect word in twig:lint command description
  Rename $key parameter to $name for consistency
  =Minor chnage: replaced function by method
  Fixed the phpdoc in the DependencyInjection component