]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorRemi Collet <remi@php.net>
Fri, 14 Oct 2016 08:55:10 +0000 (10:55 +0200)
committerRemi Collet <remi@php.net>
Fri, 14 Oct 2016 08:55:10 +0000 (10:55 +0200)
* PHP-7.1:
  use zend_error instead of zend_error_noreturn


Trivial merge