From: Stanislav Malyshev <stas@php.net>
Date: Tue, 19 Jul 2016 08:57:40 +0000 (-0700)
Subject: Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
X-Git-Tag: php-7.1.0beta1~25^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1ea7d195a2921e4b51206d09d68328ae44f1a2a;p=php

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

* 'PHP-7.0' of git.php.net:php-src:
---

f1ea7d195a2921e4b51206d09d68328ae44f1a2a