From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 Jan 2020 15:15:19 +0000 (+0100)
Subject: Merge commit '7a455971fed716123933d0f685a0d6eebcf3282b'
X-Git-Tag: fanfix-3.0.1~9
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=d3ab274f9152618a8bc21a0a20caed1a8520b224;p=fanfix.git

Merge commit '7a455971fed716123933d0f685a0d6eebcf3282b'
---

d3ab274f9152618a8bc21a0a20caed1a8520b224