Merge branch '2.7' into 2.8

fabpot · fabpot · commit 3a665af93419 · 2015-09-28T08:51:00.000+02:00
* 2.7:
  [Security] fixed composer.json
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
@@ -47,7 +47,7 @@
         "symfony/validator": "For using the user password constraint",
         "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs",
         "symfony/expression-language": "For using the expression voter",
-        "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5"
+        "ircmaxell/password-compat": "For using the BCrypt password encoder in PHP <5.5",
         "paragonie/random_compat": ""
     },
     "autoload": {
