From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 Jan 2020 17:20:56 +0000 (+0100)
Subject: Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'
X-Git-Tag: fanfix-3.0.1~7
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=505be508ae7d3fb48122be548b310a238cfb91eb;p=fanfix.git

Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'
---

505be508ae7d3fb48122be548b310a238cfb91eb