Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

diff --cc NEWS
index e81c17bf324afd25a6f560f89f9c21d5bf4906ec,988408154c70ca24caca05c3038c4af573a877e2..ea7e0c058e40ea5a5428d165f3782bc21bd93c33
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -24,7 -29,16 +24,12 @@@ PH
  - SQLite:
    . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol)
  
 -- XSL:
 -  . Fixed bug #53965 (<xsl:include> cannot find files with relative paths
 -    when loaded with "file://"). (Anatol)
 -
+ - Apache2 Handler SAPI:
+   . Fixed Apache log issue caused by APR's lack of support for %zu
+     (APR issue https://issues.apache.org/bugzilla/show_bug.cgi?id=56120).
+     (Jeff Trawick)
+ 
 -?? ??? 2014, PHP 5.5.11
 +10 Apr 2014, PHP 5.6.0 Beta 1
  
  - Core:
    . Allow zero length comparison in substr_compare() (Tjerk)

diff --cc sapi/apache2handler/sapi_apache2.c
Simple merge