From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Mon, 25 Apr 2016 12:07:44 +0000 (+0100)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=494fd1d52e812b56a7f0f5c37cf3055d55041b0b;hp=494fd1d52e812b56a7f0f5c37cf3055d55041b0b;p=max%2Fdotfiles.git

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