From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 10 Dec 2015 00:58:37 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~686
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c13fcc21c30e6875dcbe0c832a42e6eb553025e7;p=php

Merge branch 'PHP-7.0'
---

c13fcc21c30e6875dcbe0c832a42e6eb553025e7