From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 2 Oct 2015 14:26:17 +0000 (-0700)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~1048
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb6ffde023c3c19e35e32171bbc9fe74b75cd5ad;p=php

Merge branch 'PHP-7.0'
---

eb6ffde023c3c19e35e32171bbc9fe74b75cd5ad