From: Christopher Jones <sixd@php.net>
Date: Wed, 7 Oct 2015 09:31:02 +0000 (+1100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~1014
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=969072c1bd1729d6990b810c127c77781d23d78d;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
---

969072c1bd1729d6990b810c127c77781d23d78d