From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 7 Nov 2016 19:15:01 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=571b56242d94b9dcfc8156bb71ad8ad1a641a112;p=max%2Fdotfiles.git

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

571b56242d94b9dcfc8156bb71ad8ad1a641a112