]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 20 Jul 2016 05:37:44 +0000 (22:37 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 20 Jul 2016 05:37:44 +0000 (22:37 -0700)
commit17a53f9e60d0cd01fe271e245efa7306537acbcf
tree32b9993f7e2f17b2ab07f20760af7d9704ef4cbe
parente8b768dd92d3cb2a9ed45fe7ee2e9422405f7ad7
parent8ebdb1f5fd19cb15dd6ac7700c781ede5dcbba95
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Improve fix for #72520
ext/zip/zip_stream.c