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

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

e938cfc921e3532763c86c6856da426dac995830