From: Niki Roo <niki@nikiroo.be>
Date: Thu, 21 Dec 2017 06:44:56 +0000 (+0100)
Subject: Merge branch 'master' of github.com:nikiroo/fanfix
X-Git-Tag: fanfix-1.7.0~34
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=6930dfa8bc58fd89b2927e72f9115d14c602704d

Merge branch 'master' of github.com:nikiroo/fanfix
---

6930dfa8bc58fd89b2927e72f9115d14c602704d