]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Tue, 9 Feb 2016 15:35:55 +0000 (23:35 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 9 Feb 2016 15:35:55 +0000 (23:35 +0800)
commit33417bf409f22b4f15d46d09a63bfdd7c4351999
tree28e71f38181c364d9a345d1eaa8a360eb59651dc
parenta219fc175333f11c0e2fe90efd25e7d8fee5fdfb
parentc339d5217aa1966689424c911c8f455652861bf7
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/zip/php_zip.c
ext/zip/php_zip.c