From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 25 Jan 2017 10:24:01 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=4998694b7bccd0fc0f46ec99bfc136c72bd206b5;p=max%2Fdotfiles.git

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

4998694b7bccd0fc0f46ec99bfc136c72bd206b5