From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 14 Dec 2015 17:23:15 +0000 (-0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~631
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d6d28d9c64d6a0b49b05d736cc33e837f4871e8;p=php

Merge branch 'PHP-7.0'
---

8d6d28d9c64d6a0b49b05d736cc33e837f4871e8