From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 9 Nov 2015 09:15:05 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~838
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b31d2f34fbcc1febf86c1e6a7940642c55d801a0;p=php

Merge branch 'PHP-7.0'
---

b31d2f34fbcc1febf86c1e6a7940642c55d801a0