From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 7 Nov 2016 09:03:31 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=361e9f9f36f8dbf39cae8c39339ca0e74bc52840;p=max%2Fdotfiles.git

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

361e9f9f36f8dbf39cae8c39339ca0e74bc52840