Merge branch '2.3' into 2.6

* 2.3:
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json

Author: nicolas-grekas

src/Symfony/Component/HttpFoundation/composer.json

@@ -19,7 +19,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+        "symfony/phpunit-bridge": "~2.7",
         "symfony/expression-language": "~2.4"
     },
     "autoload": {

src/Symfony/Component/Templating/composer.json

@@ -19,7 +19,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0.0"
+        "symfony/phpunit-bridge": "~2.7"
         "psr/log": "~1.0"
     },
     "suggest": {