]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Fri, 6 May 2016 02:53:25 +0000 (10:53 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 6 May 2016 02:53:25 +0000 (10:53 +0800)
* PHP-7.0:
  Fixed test
  Revert "Fix bug #72162 (again)"

1  2 
Zend/zend_builtin_functions.c

Simple merge