From: Anatol Belski Date: Sat, 14 Mar 2015 17:31:02 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~660 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbc183d88a4b9e481f77a87ee539f2d6256478a7;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix test --- bbc183d88a4b9e481f77a87ee539f2d6256478a7