]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Fri, 13 Feb 2015 05:18:14 +0000 (13:18 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 13 Feb 2015 05:28:24 +0000 (13:28 +0800)
commitda7d94cd73a1f654bf49b16b5d1bf221255710de
tree7b7741213cb2f7ed9d8b687596ab41aa73b32c9a
parent5e7fd50376a3f44bd01ef1041fa0a251317c358c
parentadc42657922be5da0e7fe5ac53027c6c4960ae3e
Merge branch 'PHP-5.6'

Conflicts:
ext/soap/soap.c
ext/standard/basic_functions.c
ext/zlib/zlib.c
Zend/zend_compile.c
Zend/zend_compile.h
ext/filter/filter.c
ext/soap/soap.c
ext/standard/basic_functions.c
ext/standard/browscap.c
ext/zlib/zlib.c
sapi/cli/php_cli.c
sapi/phpdbg/phpdbg_utils.c