From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Thu, 5 Nov 2015 11:01:57 +0000 (+0000)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=sidebyside;h=8d6dff1c43c4c3055dd50e57f98dbc3544652e30;hp=-c;p=max%2Fdotfiles.git

Merge branch 'master' of github.com:maxf130/dotfiles
---

8d6dff1c43c4c3055dd50e57f98dbc3544652e30