From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 21 Nov 2016 14:14:14 +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=e1b8808d4c26702b96d3524fb32e631b6289a389;p=max%2Fdotfiles.git

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

e1b8808d4c26702b96d3524fb32e631b6289a389