From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 18 Dec 2015 09:44:05 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.2RC1~11^2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b715845650a5793c647fdf2604664af569cc5661;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
---

b715845650a5793c647fdf2604664af569cc5661