From: Mark Stapp <mjs@voltanet.io>
Date: Tue, 11 Aug 2020 16:40:52 +0000 (-0400)
Subject: Merge pull request #6870 from donaldsharp/test_fixups
X-Git-Tag: base_7.5~102
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ceb71630edbb2fc8fe00c04f60570e6800680822;p=matthieu%2Ffrr.git

Merge pull request #6870 from donaldsharp/test_fixups

Test fixups
---

ceb71630edbb2fc8fe00c04f60570e6800680822