updated CHANGELOG for 2.0.22
update CONTRIBUTORS for 2.0.22
updated VERSION for 2.0.22
updated CHANGELOG for 2.1.7
updated VERSION for 2.1.7
[Yaml] fixed typo
[DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
[Yaml] fixed unneeded BC break
Merge branch '2.0' into 2.1

* 2.0:
  [Yaml] fixed unneeded BC break
  [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
  [Yaml] fixed typo
  updated VERSION for 2.0.22
  update CONTRIBUTORS for 2.0.22
  updated CHANGELOG for 2.0.22

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
Merge branch '2.1'

* 2.1:
  [Yaml] fixed unneeded BC break
  [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation
  [Yaml] fixed typo
  updated VERSION for 2.1.7
  updated CHANGELOG for 2.1.7
  updated VERSION for 2.0.22
  update CONTRIBUTORS for 2.0.22
  updated CHANGELOG for 2.0.22

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
[Console] Removing unnecessary sprintf in Application->getHelp
merged branch gnugat/refactoring/console-get-help (PR #6789)

This PR was squashed before being merged into the master branch (closes #6789).

Commits
-------

917f473 [Console] Removing unnecessary sprintf in Application->getHelp

Discussion
----------

[Console] Removing unnecessary sprintf in Application->getHelp

Minor change of the `Symfony\Component\Console\Application->getHelp()`  method.

I have spotted:
1. an unnecessary `sprintf` call (no `args` arguments);
2. two ways of adding a new line in the help (an empty string as new entry of the array and a `\n` at the end of the string).

It seems to be there since the begining and it looks like a forgoten change to me, so I fixed them by removing the `sprintf` call and using a new array entry (empty string) instead of the `\n`.

| Q             | A
| ------------- | ---
| License       | MIT
[FrameworkBundle] fixed circular reference for service templating (closes #6730, closes #6762)
merged branch fabpot/recursion-fix (PR #6800)

This PR was merged into the master branch.

Commits
-------

94cb13d [FrameworkBundle] fixed circular reference for service templating (closes #6730, closes #6762)

Discussion
----------

[FrameworkBundle] fixed circular reference for service templating (closes #6730, closes #6762)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6730, #6762
| License       | MIT
| Doc PR        | n/a

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

by tristanbes at 2013-01-18T14:55:39Z

@fabpot Do you have an idea when you'll merge it please ?