From: Christopher Jones <christopher.jones@oracle.com>
Date: Mon, 17 Oct 2016 01:40:54 +0000 (+1100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC4~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23e2c356b73625fd25634eb8e460a60500d3dd6c;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

23e2c356b73625fd25634eb8e460a60500d3dd6c