From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Tue, 24 Apr 2018 22:16:12 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.6RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=029a60b2c7410dec9433397bb5a65ce24477794f;p=php

Merge branch 'PHP-7.1' into PHP-7.2
---

029a60b2c7410dec9433397bb5a65ce24477794f