From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 3 Jan 2016 06:07:13 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0e3ce73f067673429cf644015d2454bb2a20d80;p=php

Merge branch 'PHP-7.0'
---

d0e3ce73f067673429cf644015d2454bb2a20d80