From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 23 Jul 2018 15:06:50 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=ced1d875c880c2d594c393eef57b29d84f94f91a;hp=ced1d875c880c2d594c393eef57b29d84f94f91a;p=max%2Fdotfiles.git

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