From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 Jan 2020 15:04:07 +0000 (+0100)
Subject: Merge branch 'upstream' into subtree
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=e6bb1700749980e69b5e913acbfd276f129c24dc;hp=e6bb1700749980e69b5e913acbfd276f129c24dc;p=nikiroo-utils.git

Merge branch 'upstream' into subtree
---