]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 30 Dec 2013 06:38:45 +0000 (07:38 +0100)
committerRemi Collet <remi@php.net>
Mon, 30 Dec 2013 06:38:45 +0000 (07:38 +0100)
commit764190c1d6ccf3d4ae2cc54aacb465ccff49d9cc
tree2f5c62c9c4220c744eb3de86efb306cf71639e54
parent6b343434796f82ba6cb829f981c8ce68a82bb52c
parent0a950a05005f94e56bd2a42b99a0961db86952db
Merge branch 'PHP-5.6'

* PHP-5.6:
  Sync with pecl/zip 1.12.4dev
ext/zip/php_zip.c