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
updated VENDORS for 2.1.10
updated doc links
merged branch lsmith77/patch-2 (PR #551)

This PR was merged into the 2.2 branch.

Discussion
----------

updated doc links

Commits
-------

465686c updated doc links
Remove +x mode on file
merged branch jdespatis/master (PR #545)

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

Discussion
----------

Remove +x mode on file app/logs/.gitkeep

Mode on app/cache/.gitkeep is 100644, same mode should be applied to app/logs/.gitkeep

Further more, afaik, .gitkeep doesn't aim to be a shell script

Commits
-------

89a18a4 Remove +x mode on file
Merge branch '2.1' into 2.2

* 2.1:
  Remove +x mode on file
  updated VENDORS for 2.1.10

Conflicts:
	composer.lock
Merge branch '2.2' of github.com:symfony/symfony-standard into 2.2

Conflicts:
	README.md