Merge branch '2.6' into 2.7

* 2.6:
  [FrameworkBundle] move Routing dep up to make tests pass

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/composer.json

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -24,7 +24,7 @@
         "symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
         "symfony/http-kernel": "~2.7|~3.0.0",
         "symfony/filesystem": "~2.3|~3.0.0",
-        "symfony/routing": "~2.5|~3.0.0",
+        "symfony/routing": "~2.6,>2.6.4|~3.0.0",
         "symfony/security-core": "~2.6|~3.0.0",
         "symfony/security-csrf": "~2.6|~3.0.0",
         "symfony/stopwatch": "~2.3|~3.0.0",