From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 4 Nov 2015 11:01:31 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~870
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5385478844bf05b74c17b99a6d0078798e79f160;p=php

Merge branch 'PHP-7.0'
---

5385478844bf05b74c17b99a6d0078798e79f160