From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Mon, 24 Oct 2016 08:34:12 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=511f9cb01b77c15811cfa1c32d25432d9b89c311;hp=511f9cb01b77c15811cfa1c32d25432d9b89c311;p=max%2Fdotfiles.git

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