From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Sun, 6 Nov 2016 17:28:47 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=e6e8c107e8df472980cbeb7da025e6b70732c9fa;hp=e6e8c107e8df472980cbeb7da025e6b70732c9fa;p=max%2Fdotfiles.git

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