From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Thu, 6 Oct 2016 08:52:17 +0000 (+0100)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=ed19d200331955a2a41c50643a08e0e4fec4f0cb;hp=1f69092ab74ef61f5a2bb498f8fa9ab719b03b5c;p=max%2Fdotfiles.git

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