From: Xinchen Hui <laruence@php.net>
Date: Mon, 9 Mar 2015 09:14:55 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~743
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eed341980256a6ed7904d9fa64cec56bcbcd642d;p=php

Merge branch 'PHP-5.6'
---

eed341980256a6ed7904d9fa64cec56bcbcd642d