From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 15 Oct 2019 14:30:07 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ff5316c7f230123527e7288ab2aed73450697e9;p=php

Merge branch 'PHP-7.4'

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

6ff5316c7f230123527e7288ab2aed73450697e9