]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 5 May 2016 15:31:25 +0000 (17:31 +0200)
committerNikita Popov <nikic@php.net>
Thu, 5 May 2016 15:31:25 +0000 (17:31 +0200)
Conflicts:
Zend/zend_builtin_functions.c

1  2 
Zend/zend_builtin_functions.c

Simple merge