From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 8 Jan 2020 11:35:21 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/saltfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=sidebyside;h=1e8669d6ef20399bdcba12e3818d54d211999435;p=max%2Fsaltfiles.git

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

1e8669d6ef20399bdcba12e3818d54d211999435