From: Darshaka Pathirana <dpat@syn-net.org>
Date: Mon, 5 Feb 2018 16:19:31 +0000 (+0100)
Subject: Merge branch 'master' into patch-1
X-Git-Url: http://git.grml.org/?p=grml.org.git;a=commitdiff_plain;h=9baeab19cd47ba3d9e335b8e3aa0707242cb8677

Merge branch 'master' into patch-1
---

9baeab19cd47ba3d9e335b8e3aa0707242cb8677