From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 9 Apr 2013 08:09:33 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=255ed92b343ce576f46f6e2788be3acf61b53d11;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed ZTS build
---

255ed92b343ce576f46f6e2788be3acf61b53d11