Merge branch '2.6' into 2.7

wouterj · wouterj · commit 1cb47ab48e24 · 2015-05-24T23:25:00.000+02:00
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -1621,3 +1621,4 @@ Full Default Configuration
 .. _`Security Advisory Blog post`: http://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released#cve-2013-4752-request-gethost-poisoning
 .. _`Doctrine Cache`: http://docs.doctrine-project.org/projects/doctrine-common/en/latest/reference/caching.html
 .. _`PhpStormOpener`: https://github.com/pinepain/PhpStormOpener
+.. _`egulias/email-validator`: https://github.com/egulias/EmailValidator
