From: Michael Prokop <mika@grml.org>
Date: Fri, 4 Jun 2021 08:54:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/2'
X-Git-Tag: v1.8.0~21
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=3b2c98b36a2b07a744969d5a068e1cc2f5e92ab4;hp=fc8eadd05806b44a981f2cd7b5ec0c0d120c0791;p=grml-etc.git

Merge remote-tracking branch 'origin/pr/2'
---