From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 26 Nov 2019 08:38:46 +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=dd277321e3eca83741462ad7ef7009ba531865b4;p=max%2Fsaltfiles.git

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

dd277321e3eca83741462ad7ef7009ba531865b4