]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 14:24:22 +0000 (07:24 -0700)
committerXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 14:24:22 +0000 (07:24 -0700)
1  2 
ext/standard/basic_functions.c

Simple merge