From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 13 Jan 2014 19:10:35 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=029d019dacd2569835c6fdb2d17838aad0af9f1c;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ZTS build
---

029d019dacd2569835c6fdb2d17838aad0af9f1c