From: Bob Weinand Date: Fri, 15 May 2015 20:45:35 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/php/php-src X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~65 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b;p=php Merge branch 'master' of https://github.com/php/php-src --- 34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b