From: Remi Collet Date: Wed, 20 May 2015 06:31:46 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~36 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7bfeac419607c3a715d8663128094d110bdafea;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix new test --- f7bfeac419607c3a715d8663128094d110bdafea