From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Sat, 19 Nov 2016 10:40:07 +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=268aad1e938a9edba1dfc459791a21b7e867cec6;p=max%2Fdotfiles.git

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

268aad1e938a9edba1dfc459791a21b7e867cec6