From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 23 May 2015 02:29:45 +0000 (+0800)
Subject: Merge branch 'master' into merge-fastcgi
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fef18f4bea1980a59a9283c2197bd090aaf500cb;p=php

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

fef18f4bea1980a59a9283c2197bd090aaf500cb