From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 Jan 2020 17:19:24 +0000 (+0100)
Subject: Merge branch 'upstream-sep2019-sfix' into subtree
X-Git-Tag: fanfix-3.0.1^2~2
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=cd7e80930437e18ac719f8e2c5d93c2ca0d23cd8;p=fanfix.git

Merge branch 'upstream-sep2019-sfix' into subtree
---

cd7e80930437e18ac719f8e2c5d93c2ca0d23cd8