From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sat, 3 Jun 2017 13:08:59 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6af1d7ad014ea86c983dd9a59153f3a39073d226;p=php

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

6af1d7ad014ea86c983dd9a59153f3a39073d226