From: Xinchen Hui Date: Wed, 11 Mar 2015 00:20:19 +0000 (+0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~709 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=253420190bbabf86a499283da7495e8abe307c9a;p=php Merge branch 'PHP-5.6' --- 253420190bbabf86a499283da7495e8abe307c9a