From: Michael Prokop <mika@grml.org>
Date: Tue, 9 Mar 2021 17:05:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/github/pr/97'
X-Git-Tag: v0.38.0~7
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=977b3f281fa67423580a595b828fa52c32429597;hp=7833e771fd46dad67cf85db849f798204ca6bb9d;p=grml-live.git

Merge remote-tracking branch 'origin/github/pr/97'
---