From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Fri, 4 Nov 2016 09:20:42 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=0e7ea48dce808af8002b8b994afe0214930d5a53;hp=0e7ea48dce808af8002b8b994afe0214930d5a53;p=max%2Fdotfiles.git

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