grouped acme routes to ease installation
fixed bundle name
Added Incenteev ParameterHandler to ignore the parameters.yml file
fix redirect when project is installed in subdirectory

When neither a vhost with proper document root nor an apache alias is configured, the redirect was to the wrong location (without the path prefix). The context_prefix env variable was not available then, so we need to use the logic to determine the RewriteBase automatically as we have done it to resolve the app.php file too.
fixed access check: allow local link addresses and prevent access when XFF/HTTP_CLIENT_IP is set
merged branch bes89/update-access-check (PR #531)

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

Discussion
----------

fixed access check

allow local link addresses and prevent access when XFF is set (the same as in app_dev.php)

Commits
-------

4c34555 fixed access check: allow local link addresses and prevent access when XFF/HTTP_CLIENT_IP is set
Merge branch '2.1' into 2.2

* 2.1:
  fixed access check: allow local link addresses and prevent access when XFF/HTTP_CLIENT_IP is set
merged branch Tobion/redirect-subdir (PR #530)

This PR was merged into the 2.2 branch.

Discussion
----------

fix redirect when project is installed in subdirectory

When neither a vhost with proper document root nor an apache alias is configured, the redirect was to the wrong location (without the path prefix). The context_prefix env variable was not available then, so we need to use the logic to determine the RewriteBase automatically as we have done it to resolve the app.php file too.

BC break: no
fixes: https://github.com/symfony/symfony-standard/pull/497#issuecomment-16016232 and following

Commits
-------

3a4f0e7 fix redirect when project is installed in subdirectory
updated deps
merged branch bamarni/acme-routes (PR #494)

This PR was merged into the master branch.

Discussion
----------

Grouped acme routes

Commits
-------

66f7653 fixed bundle name
9ff1438 grouped acme routes to ease installation
removed non-MIT/BSD licensed bundles and librairies
merged branch symfony/mit (PR #535)

This PR was merged into the master branch.

Discussion
----------

removed non-MIT/BSD licensed bundles (closes #442)

In #442, there is a discussion about the license of librairies and bundles included in the Symfony Standard Edition.

This pull requests removes all non-MIT/BSDlicensed code from Symfony SE. The impact is not that big and adding back those bundles is relatively easy.

Any thoughts before I merge?

Commits
-------

d84850a removed non-MIT/BSD licensed bundles and librairies
removed obsolete code (managed by Composer now -- closes #539)
merged branch stof/parameter_handler (PR #522)

This PR was merged into the master branch.

Discussion
----------

Added Incenteev ParameterHandler to ignore the parameters.yml file

This tool allows to create the parameters.yml file when running ``composer install`` based on the ``parameters.yml.dist`` file, which can then be kept ignored. It will ask interactively for missing values, using the value of the dist file as default value (or using it directly if composer is run non-interactively). More details are available in the [Readme](https://github.com/Incenteev/ParameterHandler/).

this should help people avoiding the warning about commited parameters.yml file.

Commits
-------

8308995 Added Incenteev ParameterHandler to ignore the parameters.yml file
updated deps
removed lock file from repository

As the symfony/icu library is installed depending on the locale version
of ICU, we cannot ship a lock file anymore... probably for the best.
fix rewrite base detection for root of alias
merged branch Tobion/rewritebase-root (PR #540)

This PR was merged into the 2.2 branch.

Discussion
----------

fix rewrite base detection for root of alias

Bc break: no
Fixes #536

@fabpot please also merge 2.2 in to master then.

Commits
-------

680f09b fix rewrite base detection for root of alias
Merge branch '2.2'

* 2.2:
  fix rewrite base detection for root of alias
  fixed access check: allow local link addresses and prevent access when XFF/HTTP_CLIENT_IP is set
  fix redirect when project is installed in subdirectory
Merge branch 'master' of github.com:symfony/symfony-standard into symfony-master

Conflicts:
	app/config/routing_dev.yml