From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 29 Nov 2015 07:44:06 +0000 (-0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha2~40^2~26^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c707a6cf8fc944ba7ca9d1b1f8d16f9f2235704;p=php

Merge branch 'PHP-7.0'
---

5c707a6cf8fc944ba7ca9d1b1f8d16f9f2235704