From: Remi Collet <remi@php.net>
Date: Fri, 14 Oct 2016 08:54:47 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC4~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aecd165b8f0efe0f3bbbf12c3f1e8710fbbc0458;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  use zend_error instead of zend_error_noreturn
---

aecd165b8f0efe0f3bbbf12c3f1e8710fbbc0458