From: Tjerk Meesters Date: Tue, 23 Sep 2014 10:12:12 +0000 (+0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~52 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2795700cc1d90c94e572c5c0b88592379cf8d8a;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fixed typo --- b2795700cc1d90c94e572c5c0b88592379cf8d8a