removed useless "use" statement
merged branch aerialls/patch-1 (PR #504)

This PR was merged into the 2.1 branch.

Commits
-------

4806cf5 removed useless "use" statement

Discussion
----------

removed useless "use" statement
updated VENDORS for 2.1.9
added loader variable typehint for easier manipulation in IDEs
merged branch thunderer/autoload-class-typehint (PR #519)

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

Discussion
----------

Added $loader variable typehint for easier manipulation in IDEs.

Not all project dependencies are managed by Composer. Common solutions for (company / private) libraries and bundles are git submodules or even symlinked directories.

This PR adds typehint for `$loader` variable inside `app/autoload.php` so people won't need to search for information on what class it is and what interface it exposes when trying to add their code to autoloader.

Commits
-------

67e9d69 added loader variable typehint for easier manipulation in IDEs
added missing license and type in composer.json (refs #527)
Merge branch '2.1' into 2.2

* 2.1:
  added missing license and type in composer.json (refs #527)
  added loader variable typehint for easier manipulation in IDEs
  updated VENDORS for 2.1.9
  removed useless "use" statement
  updated VENDORS for 2.1.8
  Update composer.json

Conflicts:
	composer.json
	composer.lock
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
Merge branch '2.2' of github.com:symfony/symfony-standard into fork/nerdery/2.2

Conflicts:
	composer.json
	composer.lock
	src/Acme/DemoBundle/EventListener/ControllerListener.php
	web/.htaccess
Updates from upstream cause the rewrite base in our htaccess dist
to no longer be needed. removed from file as well as build script