From: Niki Roo <niki@nikiroo.be>
Date: Mon, 11 May 2020 22:10:12 +0000 (+0200)
Subject: Merge commit '5f3671e17febc5b7f6abbfc62c66c4045d47ec8d'
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=1e0fb97b7fccf317567bb873913fa7b92479fbef;p=fanfix.git

Merge commit '5f3671e17febc5b7f6abbfc62c66c4045d47ec8d'
---

1e0fb97b7fccf317567bb873913fa7b92479fbef