]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Fri, 16 Sep 2016 19:06:11 +0000 (21:06 +0200)
committerNikita Popov <nikic@php.net>
Fri, 16 Sep 2016 19:06:11 +0000 (21:06 +0200)
1  2 
Zend/zend_operators.h

Simple merge