From: Niki Roo <niki@nikiroo.be>
Date: Fri, 5 Apr 2019 18:10:52 +0000 (+0200)
Subject: Merge branch 'master' into android
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=43c483f32b9b554354dbd5463895109095e389a5;hp=64281bd3793857b33ca7ec15a79d2ed43885456a

Merge branch 'master' into android
---