From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 6 Dec 2016 18:23:09 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=43cfd82b72e945eecbd58001a086071d32e3d079;hp=e11ce9b1a218a3042e5f5c7468748913f2029f6a;p=max%2Fdotfiles.git

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