From: Dmitry Stogov Date: Mon, 1 Apr 2013 17:17:26 +0000 (+0400) Subject: Merge branch 'PHP-5.5' X-Git-Tag: PRE_PHPNG_MERGE~227^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11262fba8e98b02bb85a90a2046ce3c3db4df4a5;p=php Merge branch 'PHP-5.5' * PHP-5.5: Fixed ZTS build --- 11262fba8e98b02bb85a90a2046ce3c3db4df4a5