From: Ben Sturmfels <ben@sturm.com.au>
Date: Mon, 4 May 2020 03:33:27 +0000 (+1000)
Subject: Merge remote-tracking branch 'origin/master' into stable.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fc699677c9382ed49eb621daefa8301fb591e5d5;p=mediagoblin.git

Merge remote-tracking branch 'origin/master' into stable.
---

fc699677c9382ed49eb621daefa8301fb591e5d5