Merge branch 'PHP-5.4' into PHP-5.4.40

* PHP-5.4:
  fix CVE num

Author: smalyshev

NEWS

@@ -25,7 +25,7 @@ PHP                                                                        NEWS
 
 - Core:
   . Fixed bug #68976 (Use After Free Vulnerability in unserialize())
-    (CVE-2015-0231). (Stas)
+    (CVE-2015-2787). (Stas)
   . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
     configuration options). (Anatol Belski)
   . Fixed bug #69207 (move_uploaded_file allows nulls in path). (Stas)