From: Niki Roo <niki@nikiroo.be>
Date: Thu, 14 May 2020 11:25:10 +0000 (+0200)
Subject: merge from master
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=54224be8f207f5dee1d115cba658f622680a776e;hp=54224be8f207f5dee1d115cba658f622680a776e;p=fanfix.git

merge from master
---