From: Niki Roo <niki@nikiroo.be>
Date: Sat, 18 Apr 2020 15:19:31 +0000 (+0200)
Subject: Merge branch 'master' into subtree
X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=commitdiff_plain;h=148f02268b892f6df74ddd86b4b1703b74ac8da8

Merge branch 'master' into subtree
---

148f02268b892f6df74ddd86b4b1703b74ac8da8