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

Merge branch 'PHP-7.0'
---

eaa94390b3401ac531afe410378c24b998067a48