Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS

diff --cc NEWS
index ec794468eb0d4ff350b21d5083823a8d09bd6aa3,c2b6a97532dc944fbcda840b79c587f56c9be397..822dc1ea4e9c1cf91376902ea890c9e3493b350b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,11 -5,10 +5,14 @@@ PH
  - COM:
    . Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).
  
 -- Readline:
 +- FPM:
 +  . Fixed bug #67635 (php links to systemd libraries without using pkg-config).
 +    (pacho@gentoo.org, Remi)
 +
+ - OpenSSL:
+   . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas).
+ 
 +- readline:
    . Fixed bug #55496 (Interactive mode doesn't force a newline before the
      prompt). (Bob, Johannes)
    . Fixed bug #67496 (Save command history when exiting interactive shell
@@@ -18,10 -17,12 +21,7 @@@
  - Sessions:
    . Fixed missing type checks in php_session_create_id (Yussuf Khalil, Stas).
  
- - OpenSSL:
-   . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas).
 -- SPL:
 -  . Fixed bug #67539 (ArrayIterator use-after-free due to object change during
 -    sorting). (research at insighti dot org, Laruence)
 -  . Fixed bug #67538 (SPL Iterators use-after-free). (CVE-2014-4670) (Laruence)
--
 -24 Jul 2014, PHP 5.4.31
 +24 Jul 2014, PHP 5.5.15
  
  - Core:
    . Fixed bug #67428 (header('Location: foo') will override a 308-399 response