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

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

ca642231938c9909d730a2a564b1fa2d6ead0f77