From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 13 Nov 2015 13:25:06 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~748^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36d25a287b75b4c4bb69a6dd627fe39dae21e8f2;p=php

Merge branch 'PHP-7.0'
---

36d25a287b75b4c4bb69a6dd627fe39dae21e8f2