Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64764: Add status option to fpm init.d script

diff --cc NEWS
index 5ac86613c76f290c421ce46ce0f8b144076dec01,98b2ee0faad6f53e1e6336870cbd0bfec66f8b0a..d10d3f69d207ba142443afd3453800f7fbde2037
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -8,9 -8,18 +8,12 @@@ PH
    . Fixed bug #64936 (doc comments picked up from previous scanner run). (Stas,
      Jonathan Oddy)
    . Fixed bug #64934 (Apache2 TS crash with get_browser()). (Anatol)
 -  . Fixed bug #64166 (quoted-printable-encode stream filter incorrectly 
 +  . Fixed bug #64166 (quoted-printable-encode stream filter incorrectly
      discarding whitespace). (Michael M Slusarz)
  
 -- DateTime:
 -  . Fixed bug #53437 (Crash when using unserialized DatePeriod instance).
 -    (Gustavo, Derick, Anatol)
 -
+ - FPM:
 -  . Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi)
+   . Implemented FR #64764 (add support for FPM init.d script). (Lior Kaplan)
+ 
  - PDO:
    . Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to 
      the same db server). (Laruence)