Merge remote branch 'umpirsky/collection-name' into issue3738
[Form] Fixed label of prototype in CollectionType
[Form] Improved labels generated by default from form names
[DependencyInjection] Fix Yaml file loader test

This broke when 2.0 was recently merged into master with b9daae28476385d16984a729b9e7c8e30911fa23, as the Yaml fixture change from 24a0d0a2dcf334efc7d85f1c816c01d7fa4111f8 was not included.
added composer.lock to .gitignore
[Propel1Bridge][TwigBridge] fixed export instructions in the README files
merged branch jmikola/di-yaml-loader-test (PR #3808)

Commits
-------

1c3e4ac [DependencyInjection] Fix Yaml file loader test

Discussion
----------

[DependencyInjection] Fix Yaml file loader test

This broke when 2.0 was recently merged into master with b9daae28476385d16984a729b9e7c8e30911fa23, as the Yaml fixture change from 24a0d0a2dcf334efc7d85f1c816c01d7fa4111f8 was not included.

https://twitter.com/webmozart/status/188325579894947840
merged branch eriksencosta/readme-fixes (PR #3814)

Commits
-------

f3efea3 [Propel1Bridge][TwigBridge] fixed export instructions in the README files

Discussion
----------

[Propel1Bridge][TwigBridge] fixed export instructions in the README files
merged branch eriksencosta/patch-1 (PR #3813)

Commits
-------

46c7ae1 added composer.lock to .gitignore

Discussion
----------

added composer.lock to .gitignore
merged branch bschussek/issue3738 (PR #3807)

Commits
-------

6584721 [Form] Improved labels generated by default from form names
6e0b03a [Form] Fixed label of prototype in CollectionType
fc342d1 Merge remote branch 'umpirsky/collection-name' into issue3738
f91660d Added test for prototype label.

Discussion
----------

[Form] Fixed default label generated for the CollectionType prototype

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #3738, #3739
Todo: -

![Travis Build Status](https://secure.travis-ci.org/bschussek/symfony.png?branch=issue3738)

(the fact that the build fails seems to origin from the broken master)
merged branch chmielot/3446-empty-multiple-entity-choice (PR #3734)

Commits
-------

a430f3d [#3446] [Form] Fix getChoicesForValues of EntityChoiceList on empty values

Discussion
----------

[Form] Fix reverseTransform on multiple entity form type

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #3446, #3727
Todo: -

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

by stof at 2012-04-03T23:05:55Z

@bschussek ping

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

by stof at 2012-04-03T23:06:45Z

This is an alternate implementation for #3727

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

by chmielot at 2012-04-04T13:47:27Z

OK, this is another possibility to fix this issue with working tests. What do you think about this?

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

by chmielot at 2012-04-04T13:51:27Z

OK, just done.

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

by stof at 2012-04-04T13:51:39Z

@beberlei @bschussek ping

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

by bschussek at 2012-04-06T18:50:37Z

@fabpot :+1: