From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 28 Nov 2016 18:20:40 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=7751a23cc0426f2e80ed6a7b1b81efd3a8288f8e;p=max%2Fdotfiles.git

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

7751a23cc0426f2e80ed6a7b1b81efd3a8288f8e