From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 10 Dec 2019 08:04:01 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea4bb588893cb54c8350b1ae150d6ec9dd50066e;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix merge mistake
---

ea4bb588893cb54c8350b1ae150d6ec9dd50066e