]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Fri, 25 Mar 2016 04:35:20 +0000 (12:35 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 25 Mar 2016 04:35:20 +0000 (12:35 +0800)
1  2 
ext/standard/basic_functions.c

Simple merge