From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 15 Nov 2016 19:21:43 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=sidebyside;h=294d1ee3bc8dd0a60128109e34a9d184944af651;p=max%2Fdotfiles.git

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

294d1ee3bc8dd0a60128109e34a9d184944af651