]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Sat, 26 Dec 2015 04:32:46 +0000 (20:32 -0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 26 Dec 2015 04:32:46 +0000 (20:32 -0800)
1  2 
Zend/zend_builtin_functions.c

Simple merge