From: Kalle Sommer Nielsen Date: Sun, 29 Mar 2015 04:09:02 +0000 (+0200) Subject: Merge branch 'master' of https://git.php.net/push/php-src X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~477 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a0534077fcb1f8a988b6cb3f600687c1706f36c;p=php Merge branch 'master' of https://git.php.net/push/php-src --- 1a0534077fcb1f8a988b6cb3f600687c1706f36c