From: Xinchen Hui Date: Mon, 4 May 2015 02:34:57 +0000 (+0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~108 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02110bdfaa8ecc361a612779703f45df313530b3;p=php Merge branch 'PHP-5.6' --- 02110bdfaa8ecc361a612779703f45df313530b3