From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 22 Aug 2019 07:26:07 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/saltfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=735c5d5e3a1aab82d77d9461157ecff74dde67a0;p=max%2Fsaltfiles.git

Merge branch 'master' of git.friedersdorff.com:max/saltfiles
---

735c5d5e3a1aab82d77d9461157ecff74dde67a0