From: Xinchen Hui <laruence@php.net>
Date: Fri, 15 May 2015 14:57:36 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~65^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7cead987bd5179506225afa696abb43d722d1253;p=php

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

7cead987bd5179506225afa696abb43d722d1253