From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 23 Jun 2017 11:31:39 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha3~46^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=721de5b54229724b3d77b134a33794f0f0961904;p=php

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

721de5b54229724b3d77b134a33794f0f0961904