From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 27 May 2019 16:43:18 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a11f3b166938acbbd91d5a9c0b41430a661a156;p=php

Merge branch 'PHP-7.4'

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

8a11f3b166938acbbd91d5a9c0b41430a661a156