From: Remi Collet <remi@php.net>
Date: Thu, 15 Sep 2016 11:29:26 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.12RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19e04784ac2a4ea50e9f3bbcc92122d9ccc6c4d5;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix ZTS build
---

19e04784ac2a4ea50e9f3bbcc92122d9ccc6c4d5