From: Xinchen Hui <laruence@php.net>
Date: Tue, 21 Apr 2015 14:45:19 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~195
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a18c4c99eac408e9c7725738e64ba55cbaaf7acb;p=php

Merge branch 'PHP-5.6'
---

a18c4c99eac408e9c7725738e64ba55cbaaf7acb