Added framework config option: trusted_hosts
Merge branch '2.3'

* 2.3:
  Backport issue 426 / PR 429 to branch 2.2
  updated VENDORS for 2.2.10
  updated VENDORS for 2.2.9

Conflicts:
	app/config/config_dev.yml
Fixed the path to config.php in the readme file
minor #605 Fixed the path to config.php in the readme file (jaspernbrouwer)

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

Discussion
----------

Fixed the path to config.php in the readme file

I think the title says it all.

Commits
-------

415f7d8 Fixed the path to config.php in the readme file
feature #585 Added framework config option: trusted_hosts (pulzarraider)

This PR was merged into the master branch.

Discussion
----------

Added framework config option: trusted_hosts

Commits
-------

01b6ed3 Added framework config option: trusted_hosts
Merge branch '2.4'

* 2.4:
  updated min stability to beta
  updated VENDORS for 2.4.0-BETA1
Allow Doctrine 2.4 to be installed
make htaccess deny in src and app work with apache 2.4
bug #621 make htaccess deny in src and app work with apache 2.4 (Tobion)

This PR was merged into the 2.3 branch.

Discussion
----------

make htaccess deny in src and app work with apache 2.4

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | |no
| Tests pass?   | yes
| Fixed tickets | #602
| License       | MIT

Based on findings in https://drupal.org/node/1599774
Made it work under both apache 2.2 and 2.4.

Commits
-------

38c2a50 make htaccess deny in src and app work with apache 2.4
Fixed PHPUnit doc URL

Any links to `www.phpunit.de` now redirects to the front page. Stripping `www.` off fixes the issue.
minor #623 Fixed PHPUnit doc URL (gnugat)

This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #623).

Discussion
----------

Fixed PHPUnit doc URL

Any links to `www.phpunit.de` now redirects to the front page. Stripping `www.` off fixes the issue.

Commits
-------

e958959 Fixed PHPUnit doc URL
Merge branch '2.4'

* 2.4:
  bumped 2.4 to stable
  updated VENDORS for 2.4.0-RC1
  updated to FrameworkExtraBundle 3.0 (examples updated as well)
  backported #585
  Added config to force Symfony to use native session handler by default
bumped Symfony version to 2.5@dev
moved generator bundle from require to require-dev in composer deps
Merge branch '2.3' into 2.4

* 2.3:
  Fixed PHPUnit doc URL
  make htaccess deny in src and app work with apache 2.4
Merge branch '2.4'

* 2.4:
  Fixed PHPUnit doc URL
  make htaccess deny in src and app work with apache 2.4
minor #612 Allow Doctrine 2.4 to be installed (jdespatis)

This PR was merged into the 2.3 branch.

Discussion
----------

Allow Doctrine 2.4 to be installed

The commit https://github.com/symfony/symfony-standard/commit/0cafa504b6d1235c901d127da01c996219341e6c#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780, lets Doctrine 2.4 installable

But it has been performed only on `master`, `2.4`

Any reason why it shouldn't also be backported to last stable version of `symfony-standard` (`2.3`) ?

Commits
-------

42937c1 Allow Doctrine 2.4 to be installed
tweaked README
moved some dev settings to parameters.yml
feature #603 moved some dev settings to parameters.yml (kriswallsmith)

This PR was squashed before being merged into the 2.4-dev branch (closes #603).

Discussion
----------

moved some dev settings to parameters.yml

So developers can enable or disable this stuff.

Commits
-------

f40a391 moved some dev settings to parameters.yml