From: Christopher Jones <christopher.jones@oracle.com>
Date: Sun, 15 Nov 2015 21:16:07 +0000 (+1100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~748^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a1349b336633e5977c41d555035c7146e06e0c7;p=php

Merge branch 'PHP-7.0'
---

1a1349b336633e5977c41d555035c7146e06e0c7