]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Sat, 8 Oct 2016 15:00:56 +0000 (17:00 +0200)
committerNikita Popov <nikic@php.net>
Sat, 8 Oct 2016 15:00:56 +0000 (17:00 +0200)
1  2 
Zend/zend_compile.c

Simple merge