From: Xinchen Hui Date: Wed, 22 Apr 2015 08:36:29 +0000 (+0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~185 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b8d6bd9adb2d1602204295360bbf5dce24a0300;p=php Merge branch 'PHP-5.6' --- 0b8d6bd9adb2d1602204295360bbf5dce24a0300