]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 13 Apr 2014 22:38:20 +0000 (15:38 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 13 Apr 2014 22:39:32 +0000 (15:39 -0700)
commit1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee
treed725141bbc3ad5287ebc52491154129fcd28d993
parent3aab84c1008cddca9f4429c9079a94a52966eb07
parentc5275b4a92fb9689d8d26112a9c3f91def201d35
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
NEWS
sapi/apache2handler/sapi_apache2.c