]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Mon, 22 Feb 2016 08:26:14 +0000 (09:26 +0100)
committerRemi Collet <remi@php.net>
Mon, 22 Feb 2016 08:26:14 +0000 (09:26 +0100)
commite8385a60b388c057134ba3d53c11ecd4a9a14703
tree059637fbbcf52b4279d65d15824ee6fa15f9752c
parentd25e67eee653c8ce8ce1a4459181e3b802eb915c
parentd20f1d8f1f6a238cb290f5ccab2de1ac3dcaa03a
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  cleanup $Id
ext/zip/php_zip.c
ext/zip/php_zip.h
ext/zip/zip_stream.c