From: Xinchen Hui <laruence@php.net>
Date: Tue, 10 Mar 2015 09:09:28 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~723
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7df8a683278f889a1f7487aef8abc99501c01332;p=php

Merge branch 'PHP-5.6'
---

7df8a683278f889a1f7487aef8abc99501c01332