From: Xinchen Hui <laruence@php.net>
Date: Thu, 5 Mar 2015 11:06:02 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~806
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eec5ab7672b0b14d31c3f9f6ce6f4e52c22f76cb;p=php

Merge branch 'PHP-5.6'
---

eec5ab7672b0b14d31c3f9f6ce6f4e52c22f76cb