From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 15 Sep 2015 15:24:31 +0000 (-0700)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~1163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d291eaa97ec7126d701e0343d9ef5d19df2cca89;p=php

Merge branch 'PHP-7.0'
---

d291eaa97ec7126d701e0343d9ef5d19df2cca89