From: Xinchen Hui <laruence@php.net>
Date: Tue, 10 Mar 2015 09:09:41 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~722
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4c1dca98cbf40572c3355a3b3b09a298f306165;p=php

Merge branch 'master' of https://git.php.net/repository/php-src
---

d4c1dca98cbf40572c3355a3b3b09a298f306165