From: Nikita Popov <nikic@php.net>
Date: Sat, 30 Jul 2016 14:29:33 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e8c4fcc40f085af505520f502634066087a43d2;p=php

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

7e8c4fcc40f085af505520f502634066087a43d2