[Console] fixed some CS
fixed some CS
In console terms columns are width and rows are height
Change must-proxy-revalidate by proxy-revalidate
merged branch mvrhov/exchangeWidthHeight (PR #4299)

Commits
-------

445fd2f In console terms columns are width and rows are height

Discussion
----------

[Console] Exchange terminal width and height

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

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

by travisbot at 2012-05-16T09:20:08Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1344055) (merged 445fd2f9 into 8cd6cbcf).
merged branch ouardisoft/2.0 (PR #4300)

Commits
-------

d1c831d Change must-proxy-revalidate by proxy-revalidate

Discussion
----------

Change must-proxy-revalidate by proxy-revalidate

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

by travisbot at 2012-05-16T09:20:54Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1344060) (merged d1c831d7 into 8cd6cbcf).
Be more specific in phpdoc (Fixes #3216)
merged branch aderuwe/issue-3216 (PR #4304)

Commits
-------

6341de0 Be more specific in phpdoc (Fixes #3216)

Discussion
----------

Modify TwigEngine.php's signature (#3216)

This fixes the "line-ending issues" in TwigEngine.php responsible for connection reset errors on windows (which do still occur on 2.0.13, when ```core.autocrlf``` is set to GitHub's recommendation rather than Symfony's), caused by factors out of Symfony's control.

I acknowledge the comments on the above issue, but it seems this is trivial to do and it will save a bunch of time for people who find themselves in this situation.

Bug fix: [no]
Feature addition: [no]
Backwards compatibility break: [no]
Symfony2 tests pass: phpdoc changes
Fixes the following tickets: [#3216]
License of the code: MIT

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

by travisbot at 2012-05-16T19:35:55Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1348808) (merged 6341de02 into 980a0620).
updated CHANGELOG for 2.0.14
update CONTRIBUTORS for 2.0.14
updated VERSION for 2.0.14
Fixed the proxy autoloading for Doctrine 2.2
Fixed the composer constraint for Doctrine Common
merged branch stof/common_deps (PR #4318)

Commits
-------

d1f0c25 Fixed the composer constraint for Doctrine Common

Discussion
----------

Common deps

This allows using Doctrine 2.2 when using the full repo as it is compatible. The workaround previously was to use the individual components as the deps was less strict in them.

Closes #4289

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

by travisbot at 2012-05-17T22:36:03Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1361187) (merged d1f0c254 into b3799680).
merged branch stof/doctrine_autoloading (PR #4317)

Commits
-------

fff7221 Fixed the proxy autoloading for Doctrine 2.2

Discussion
----------

Doctrine autoloading

This fixes the autoloading of proxies for Doctrine 2.2

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

by travisbot at 2012-05-17T22:36:11Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1361173) (merged fff72217 into b3799680).
bumped Symfony version to 2.0.15-DEV
constraint_validation option can now be an array

Conflicts:
	src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php