From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 1 Apr 2016 14:27:42 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~390^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67476872cd837f620851808e02ac15301a5c619b;p=php

Merge branch 'PHP-7.0'
---

67476872cd837f620851808e02ac15301a5c619b