From: Xinchen Hui <laruence@php.net>
Date: Wed, 20 May 2015 08:56:28 +0000 (+0800)
Subject: Merge branch 'patch-5' of https://github.com/ovr/php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~34^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4129694a823076fc9bc32b61e326d45fbc01250;p=php

Merge branch 'patch-5' of https://github.com/ovr/php-src
---

c4129694a823076fc9bc32b61e326d45fbc01250