Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix cve number

Author: cjbj

NEWS

@@ -102,7 +102,7 @@ PHP                                                                        NEWS
     odbc_fetch_array). (Brandon Kirsch)
 
 - Openssl:
-  . Fixed handling null bytes in subjectAltName (CVE-2013-4073). 
+  . Fixed handling null bytes in subjectAltName (CVE-2013-4248).
     (Christian Heimes)
 
 - PDO: