From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 25 Sep 2017 08:20:16 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=243abbfb507645037bcdc85d9bd5798776c1e46a;p=max%2Fdotfiles.git

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

243abbfb507645037bcdc85d9bd5798776c1e46a