From: Bob Weinand Date: Mon, 25 May 2015 17:00:53 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/php/php-src X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~32^2~8 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=306a0f28d0a7591cb959793b71e8ebaeae85ed3b;p=php Merge branch 'master' of https://github.com/php/php-src --- 306a0f28d0a7591cb959793b71e8ebaeae85ed3b