From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 18 Nov 2019 11:34:31 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/saltfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=17631753b72bafef13e96a690e5110af9d611770;hp=-c;p=max%2Fsaltfiles.git

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

17631753b72bafef13e96a690e5110af9d611770