From: Christopher Jones <christopher.jones@oracle.com>
Date: Thu, 4 Aug 2016 06:45:29 +0000 (+1000)
Subject: Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
X-Git-Tag: php-7.1.0beta3~111^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06be3c659c27d2e32d32b9c854df95395e2f3f6e;p=php

Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
---

06be3c659c27d2e32d32b9c854df95395e2f3f6e