From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 26 May 2015 06:17:21 +0000 (+0800)
Subject: Merge branch 'master' into merge-fastcgi
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49b10ee264c88edc4fc52d4ab9ae1ca843be7c1f;p=php

Merge branch 'master' into merge-fastcgi
---

49b10ee264c88edc4fc52d4ab9ae1ca843be7c1f