updated composer.json deps
updated deps
fixed configuration (closes #484)
[Config] fix consistency
merged branch vicb/fix-config (PR #491)

This PR was merged into the 2.2 branch.

Commits
-------

c70473e [Config] fix consistency

Discussion
----------

[Config] fix consistency
Update src/Acme/DemoBundle/Twig/Extension/DemoExtension.php
merged branch matteocaberlotto/patch-1 (PR #493)

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

Commits
-------

4b19ada Update src/Acme/DemoBundle/Twig/Extension/DemoExtension.php

Discussion
----------

Update src/Acme/DemoBundle/Twig/Extension/DemoExtension.php

modified FilesystemLoader to a more generic \Twig_LoaderInterface

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

by Baachi at 2013-02-04T11:01:54Z

You should remove the `use` statement, too.
updated VENDORS for 2.2.0-RC1
grouped acme routes to ease installation
fixed bundle name
updated VENDORS for 2.2.0-RC2
fixed README
redirect /app.php to prevent duplicate content
removed QSA flag that is not needed
added info about changed .htaccess
merged branch Tobion/patch-2 (PR #497)

This PR was merged into the 2.2 branch.

Commits
-------

99106de added info about changed .htaccess
b46c01a removed QSA flag that is not needed
7da3383 redirect /app.php to prevent duplicate content

Discussion
----------

redirect /app.php to prevent duplicate content

bc break: no
fix #469

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

by Tobion at 2013-02-22T12:43:02Z

@fabpot finished and tested.

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

by vicb at 2013-02-22T12:59:01Z

What about removing the L flag altogether ?

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

by Tobion at 2013-02-22T13:00:53Z

Right we can do that because END includes L

> Using the [END] flag terminates not only the current round of rewrite processing (like [L]) ...

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

by Tobion at 2013-02-22T13:12:06Z

@vicb done.
Update composer.json

Bump doctrine dependency for symfony 2.1 users.
merged branch guilhermeblanco/patch-1 (PR #498)

This PR was merged into the 2.1 branch.

Commits
-------

b118637 Update composer.json

Discussion
----------

Update composer.json

Bump doctrine dependency for symfony 2.1 users.
updated VENDORS for 2.1.8
updated VENDORS for 2.2.0-RC3