From: Christopher Jones <christopher.jones@oracle.com>
Date: Thu, 4 Aug 2016 07:02:08 +0000 (+1000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~1558^2~48^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6aeb9ba44792bcbfb90f88ac9aadf396c74717a5;p=php

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

6aeb9ba44792bcbfb90f88ac9aadf396c74717a5