Merge branch '2.5' into 2.6

* 2.5:
  [Debug] add missing conflict dep rules

src/Symfony/Component/Debug/composer.json

@@ -19,6 +19,9 @@
         "php": ">=5.3.3",
         "psr/log": "~1.0"
     },
+    "conflict": {
+        "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+    },
     "require-dev": {
         "symfony/class-loader": "~2.2",
         "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",