From: Christopher Jones <christopher.jones@oracle.com>
Date: Wed, 25 Nov 2015 01:44:10 +0000 (+1100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~705^2~40^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=850ef17c5da40515e9d1eb380b243572f958369f;p=php

Merge branch 'PHP-7.0'
---

850ef17c5da40515e9d1eb380b243572f958369f