From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 27 Nov 2019 13:05:47 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7edbbdbbb11f4ddf1d87468b04b9d0fb0212791;p=php

Merge branch 'PHP-7.4'

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

b7edbbdbbb11f4ddf1d87468b04b9d0fb0212791