Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Fri, 2 Dec 2016 16:03:59 +0000 (17:03 +0100)
committerNikita Popov <nikic@php.net>
Fri, 2 Dec 2016 16:03:59 +0000 (17:03 +0100)
1  2 
Zend/zend_operators.c

Simple merge