From: Ard Biesheuvel Date: Sat, 20 Sep 2014 23:42:31 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~158^2~80^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90fcf0f52a533225e9e1f823d9e292b759e156b6;p=php Merge branch 'PHP-5.6' --- 90fcf0f52a533225e9e1f823d9e292b759e156b6