From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 19 Apr 2013 17:44:00 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fe5ee4d6ac391f89ba529d6a7780be3cd463734;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed 5.2 ZTS build
---

1fe5ee4d6ac391f89ba529d6a7780be3cd463734