From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Fri, 6 Nov 2015 11:39:36 +0000 (+0000)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=ffd156ded0f3b8473c9662815a7edce93035bb21;hp=ffd156ded0f3b8473c9662815a7edce93035bb21;p=max%2Fdotfiles.git

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