From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 Jan 2020 15:05:05 +0000 (+0100)
Subject: Merge commit 'e6bb1700749980e69b5e913acbfd276f129c24dc'
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=c4cefaa04ec122fc02efb6542451a31fdf722c32;hp=c4cefaa04ec122fc02efb6542451a31fdf722c32;p=fanfix.git

Merge commit 'e6bb1700749980e69b5e913acbfd276f129c24dc'
---