From: Niki Roo <niki@nikiroo.be>
Date: Mon, 6 Apr 2020 10:33:16 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Tag: fanfix-3.1.2~20^2~15^2~1
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=47c7bfdbac1eab4d3defb14e9585283026eacbbf;p=fanfix.git

Merge branch 'subtree'
---

47c7bfdbac1eab4d3defb14e9585283026eacbbf