From: Dmitry Stogov Date: Mon, 13 Jan 2014 19:11:36 +0000 (+0400) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~388^2~63^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5980e987d2d038910b2be0d2e4deda7b140095c9;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fixed ZTS build --- 5980e987d2d038910b2be0d2e4deda7b140095c9