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

Merge branch 'PHP-7.0'
---

681d2c946e4a1e06e1cb01ee8a67b22f4943f81e