From: Xinchen Hui <laruence@php.net>
Date: Thu, 7 May 2015 11:25:41 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbd1f1f282466bd709081e104d65baf597aee666;p=php

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

fbd1f1f282466bd709081e104d65baf597aee666