From: Niki Roo <niki@nikiroo.be>
Date: Tue, 9 Apr 2019 06:30:15 +0000 (+0200)
Subject: Merge branch 'android' of git.nikiroo.be:git/fanfix into android
X-Git-Tag: fanfix-3.0.0~28^2
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=refs%2Fheads%2Fandroid;p=fanfix.git

Merge branch 'android' of git.nikiroo.be:git/fanfix into android
---

9978a56a375a8f6f456f0bfc7d1124d9281eea49