From: Kalle Sommer Nielsen Date: Wed, 25 Mar 2015 05:32:29 +0000 (+0100) Subject: Merge branch 'master' of https://git.php.net/push/php-src X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~493^2~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c340b186f87b6522202af2a501ed05b2c6205cf3;p=php Merge branch 'master' of https://git.php.net/push/php-src --- c340b186f87b6522202af2a501ed05b2c6205cf3