Merge branch 'PHP-7.0' into PHP-7.1
authorSara Golemon <pollita@php.net>
Thu, 27 Jul 2017 14:04:14 +0000 (10:04 -0400)
committerSara Golemon <pollita@php.net>
Thu, 27 Jul 2017 14:04:14 +0000 (10:04 -0400)
commitb62fb3aa0c7968b9f478df355b18b7343efe87e0
tree6f1ab91e506a809c45561943dd6b9ac615dcadbd
parent0ddda0dcb73502d33bc89696f0a625cbae35d2a3
parent34e5d3a87d0b0a01578754b646f50d01a087ba7c
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Simpler fix for #74974
Zend/zend_operators.c
Zend/zend_portability.h