From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sun, 16 Jun 2019 09:56:21 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d806d9a643d2020489b543cc008d59642a1714a7;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent parallel test conflict
---

d806d9a643d2020489b543cc008d59642a1714a7