From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 15 Oct 2015 10:47:13 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~961
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b6345b48d8b548751d53747ef48852633a8811f;p=php

Merge branch 'PHP-7.0'
---

2b6345b48d8b548751d53747ef48852633a8811f