]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Thu, 4 Sep 2014 19:23:11 +0000 (21:23 +0200)
committerNikita Popov <nikic@php.net>
Thu, 4 Sep 2014 19:23:11 +0000 (21:23 +0200)
Conflicts:
ext/soap/php_http.c

1  2 
ext/gmp/gmp.c
sapi/litespeed/lsapi_main.c

diff --cc ext/gmp/gmp.c
Simple merge
Simple merge