From: Michael Prokop <mika@grml.org>
Date: Tue, 9 Jun 2020 19:37:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/github/pr/2'
X-Git-Tag: v0.8~9
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=508d788851b99c4054b465d6ff40834905738e82;hp=7d13ed673ba4a60bedee33f666820df4dfacb09b;p=grml-paste.git

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