Merge branch '3.0' into 3.1

fabpot · fabpot · commit cef19150c2e8 · 2016-06-28T18:34:15.000+02:00
* 3.0:
  fixed typo
diff --git a/composer.json b/composer.json
@@ -84,7 +84,7 @@
         "monolog/monolog": "~1.11",
         "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
         "predis/predis": "~1.0",
-        "egulias/email-validator": "~1.2,>=1.2.1"
+        "egulias/email-validator": "~1.2,>=1.2.1",
         "symfony/polyfill-apcu": "~1.1",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0"
