From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 24 May 2015 06:23:34 +0000 (+0800)
Subject: Merge branch 'master' into merge-fastcgi
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61f652a1798ecb9f9cda70cc0ca8021be52c7d2b;p=php

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

61f652a1798ecb9f9cda70cc0ca8021be52c7d2b