From: Niki Roo <niki@nikiroo.be>
Date: Wed, 28 Mar 2018 13:21:37 +0000 (+0200)
Subject: Merge commit '2953f98805434534094068a52bf983b71282cf5c' into wip
X-Git-Tag: fanfix-1.7.0~2^2~1
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=4ec79417fe5bd4344ac12b39ac8c98db8f9276f6;p=fanfix.git

Merge commit '2953f98805434534094068a52bf983b71282cf5c' into wip
---

4ec79417fe5bd4344ac12b39ac8c98db8f9276f6