From: Niki Roo <niki@nikiroo.be>
Date: Tue, 9 Apr 2019 06:27:08 +0000 (+0200)
Subject: Merge branch 'master' into android
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=76f58e5637fb3b329ce15d847987f24b9fdaf04d

Merge branch 'master' into android
---

76f58e5637fb3b329ce15d847987f24b9fdaf04d