From: Daniel Lowrey <rdlowrey@php.net>
Date: Thu, 5 Mar 2015 19:13:33 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.7RC1~2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=010f17534f6c6a82183253937c75aa689e55e0bc;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix ZTS build
---

010f17534f6c6a82183253937c75aa689e55e0bc