From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 5 Jan 2016 15:02:55 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=671987ce835890ad199f76d608a3054b04b11986;p=php

Merge branch 'PHP-7.0'
---

671987ce835890ad199f76d608a3054b04b11986