From: Christopher Jones <sixd@php.net>
Date: Tue, 9 Aug 2016 06:13:27 +0000 (+1000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta3~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3fdc5f68054fbd645cdc7cd9f5c3254bcad6c3d;p=php

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

a3fdc5f68054fbd645cdc7cd9f5c3254bcad6c3d