From: Ferenc Kovacs Date: Sat, 29 Nov 2014 00:49:40 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~116 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=719083bd943e6c287c2dcb47918cf51f89a4ac08;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix test with readline on mac --- 719083bd943e6c287c2dcb47918cf51f89a4ac08