Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix the broken sh syntax in ext/imap/config.m4.

diff --cc NEWS
index 7b37e076b3404bf78fe67e0ddd8c9d8529c48df7,bb170e7fcf9fa1b4b19e52564f89ca44cabe1b6a..aa3f8d212564adb5beaee50d5c56317fd813fa5f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,28 -5,21 +5,32 @@@ PH
  - CLI server:
    . Fixed bug #65633 (built-in server treat some http headers as
      case-sensitive). (Adam)
 +  . Added application/pdf to PHP CLI Web Server mime types (Chris Jones)
  
  - Datetime:
 -  . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error
 -    message). (Boro Sitnikovski)
 +  . Fixed bug #65502 (DateTimeImmutable::createFromFormat returns DateTime).
 +    (Boro Sitnikovski)
 +  . Fixed bug #65548 (Comparison for DateTimeImmutable doesn't work).
 +    (Boro Sitnikovski)
  
 -- Filter:
 -  . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn)
 -  . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
 -    (Syra)
 +- GD
 +  . Ensure that the defined interpolation method is used with the generic
 +    scaling methods. (Pierre)
  
 -?? ??? 2013, PHP 5.4.20
+ - IMAP:
+   . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling
+     imap). (ryotakatsuki at gmail dot com)
+ 
 +- OPcache:
 +  . Fixed bug #65665 (Exception not properly caught when opcache enabled).
 +    (Laruence)
 +  . Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var). (Dmitry)
 +
 +- SPL:
 +  . Fix bug #64782 (SplFileObject constructor make $context optional / give it
 +    a default value). (Nikita)
 +
 +?? ??? 2013, PHP 5.5.4
  
  - Core:
    . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).

diff --cc ext/imap/config.m4
Simple merge