From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 25 Jun 2017 13:30:29 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha3~28^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bda0f4e8dce25280ee9db4b6058b80b74a80991f;p=php

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

bda0f4e8dce25280ee9db4b6058b80b74a80991f