From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 16 Nov 2016 13:47:22 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~920^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f3a5b45019d318179113b79d2b92fcb367c1ab7;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed ZTS build
---

1f3a5b45019d318179113b79d2b92fcb367c1ab7