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

Merge branch 'PHP-7.0'
---

22d79c8d14d33f7a47172d65189eea5baba291d0