]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Fri, 12 Feb 2016 16:58:12 +0000 (17:58 +0100)
committerNikita Popov <nikic@php.net>
Fri, 12 Feb 2016 16:58:12 +0000 (17:58 +0100)
1  2 
Zend/zend_compile.c

Simple merge