From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Sun, 17 Nov 2019 22:10:48 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/saltfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=e0961b3e478274075a3cfbef9993fe61bd5e3c7f;p=max%2Fsaltfiles.git

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

e0961b3e478274075a3cfbef9993fe61bd5e3c7f