Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_API.c

diff --cc NEWS
index 0a57834b7519eef5948aea8386ee86cde6d80434,2dbe468d4da9225c5dab205f97b6d3c207486d58..a777e8d7f3625fa86598596c819eb00d1f1a4365
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,14 -1,12 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.18
 +?? ??? 2013, PHP 5.5.1
  
  - Core:
 -  . Fixed bug #65108 (is_callable() triggers Fatal Error). 
 -    (David Soria Parra, Laruence)
    . Fixed bug #65088 (Generated configure script is malformed on OpenBSD).
      (Adam)
-   . Fixed bug #65108 (is_callable() triggers Fatal Error). (David Soria Parra)
++  . Fixed bug #65108 (is_callable() triggers Fatal Error). 
++    (David Soria Parra, Laruence)
 +
 +OPcache
 +  . OPcache must be compatible with LiteSpeed SAPI (Dmitry)
  
  - CLI server:
    . Fixed bug #65066 (Cli server not responsive when responding with 422 http

diff --cc Zend/zend_API.c
Simple merge