From: Nikita Popov <nikic@php.net>
Date: Fri, 22 Jul 2016 15:22:29 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta2~86^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc04f2d2dbf3df448f133ae631fea3af6ba535e0;p=php

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

dc04f2d2dbf3df448f133ae631fea3af6ba535e0