From: Anatol Belski Date: Tue, 25 Nov 2014 16:57:51 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~142 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6900f573b79e71321ce4c94fee13befbfc0d4b16;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix TS build --- 6900f573b79e71321ce4c94fee13befbfc0d4b16