From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 7 Dec 2017 13:59:05 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=1b17ece26e2019c0d2d2eb3d612e2dff5cca0169;hp=1b17ece26e2019c0d2d2eb3d612e2dff5cca0169;p=max%2Fdotfiles.git

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