]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Wed, 15 Apr 2015 15:38:01 +0000 (17:38 +0200)
committerRemi Collet <remi@php.net>
Wed, 15 Apr 2015 15:38:01 +0000 (17:38 +0200)
commitc48bf6e55c2abf0b8f3fb359971375821673f776
tree93be4aeb61ab383f6a87bce5833946367d2e6810
parent6aee1ee4a187b1653b4e702104e55332ef897691
parent60b3526bfb5c9fe37d04ff69d0f5e7ea74ed947e
Merge branch 'PHP-5.6'

* PHP-5.6:
  bump zip release to match pecl version
ext/zip/php_zip.h