Merge branch '2.0' into 2.1

* 2.0:
  [Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
  Show correct class name InputArgument in error message
  shows correct class name InputOption in error message
  The exception message should say which field is not mapped
  [HttpFoundation] Fix name sanitization after perfoming move
  Add check to Store::unlock to ensure file exists

Conflicts:
	src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
	src/Symfony/Component/HttpFoundation/File/UploadedFile.php
	tests/Symfony/Tests/Component/Console/Input/InputArgumentTest.php
	tests/Symfony/Tests/Component/Console/Input/InputOptionTest.php
	tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
	tests/Symfony/Tests/Component/HttpFoundation/File/FileTest.php
	tests/Symfony/Tests/Component/HttpKernel/HttpCache/StoreTest.php
added missing tests from previous merge
merged branch mborgmann/patch-1 (PR #5930)

This PR was merged into the master branch.

Commits
-------

04e93d8 Update UPGRADE-2.1.md

Discussion
----------

Update UPGRADE-2.1.md

Change on selectedchoice part, because "choice.value" wont work, but just "value" does.
[Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
merged branch bschussek/issue2059 (PR #5945)

This PR was merged into the 2.0 branch.

Commits
-------

8fb334f [Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8

Discussion
----------

[Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
Merge branch '2.0' into 2.1

* 2.0:
  [Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
[Form] Fixed forms not to be marked invalid if their children are already marked invalid
[ClassLoader] Make ApcClassLoader properly decorate ClassLoader.
merged branch sun/classloader-apc-decorate (PR #5950)

This PR was merged into the master branch.

Commits
-------

d231b8f [ClassLoader] Make ApcClassLoader properly decorate ClassLoader.

Discussion
----------

[ClassLoader] Make ApcClassLoader properly decorate ClassLoader.

ApcClassLoader only implements the findFile() and loadClass() methods, but none of the other methods.  That's an implementation detail, which isn't particularly trivial.

I can't see a reason for why ApcClassLoader cannot simply decorate ClassLoader in a proper way, passing forward all unknown method calls to ClassLoader.

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

by sun at 2012-11-09T03:00:51Z

mmm, the test failures seem to be irrelevant.  It passed on the PHP 5.4 environment.  The others failed on early pre-test infrastructure operations.
[HttpKernel] added memory information in the Stopwatch
merged branch fabpot/stopwatch (PR #5944)

This PR was merged into the master branch.

Commits
-------

380cf4f [HttpKernel] added memory information in the Stopwatch

Discussion
----------

[HttpKernel] added memory information in the Stopwatch
merged branch bschussek/issue4359 (PR #5947)

This PR was merged into the 2.1 branch.

Commits
-------

4909bc3 [Form] Fixed forms not to be marked invalid if their children are already marked invalid

Discussion
----------

[Form] Fixed forms not to be marked invalid if their children are already marked invalid

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #4359
Todo: -
License of the code: MIT
Documentation PR: -

This PR prevents unsynchronized forms from being marked invalid if any of their children is also unsynchronized (and thus also marked invalid). Displaying an invalid message twice does not help the user and, if used in conjunction with error bubbling, may lead to duplicate errors (see #4359).
[HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937)
Adding new localized strings for farsi validation.
Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf

Adding missed localized string.
merged branch empire/patch-vadlidator-translation (PR #5955)

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

Commits
-------

c2955b7 Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
2dd87ae Adding new localized strings for farsi validation.

Discussion
----------

Adding new localized strings for farsi validation.

Adding new localized strings for farsi validation.
merged branch gajdaw/gitattributes-windows (PR #5938)

This PR was merged into the 2.1 branch.

Commits
-------

646a714 Fix export-ignore on Windows

Discussion
----------

Fix export-ignore on Windows

Rules:

    Tests/ export-ignore

don't work on Windows. My proposition is:

    /Tests export-ignore
moved the Stopwatch classes to their own component
Fixed case of php function
merged branch pborreli/patch-1 (PR #5957)

This PR was merged into the 2.0 branch.

Commits
-------

235250e Fixed case of php function

Discussion
----------

Fixed case of php function