From: Xinchen Hui <laruence@php.net>
Date: Wed, 25 Mar 2015 05:54:49 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~494
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2e6b86fdcbb0a9d2996ed2a28e44dd442e6e3fd;p=php

Merge branch 'PHP-5.6'
---

f2e6b86fdcbb0a9d2996ed2a28e44dd442e6e3fd