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

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

c380b2813a165ea3337954d7b7e9f7ed0c298427