From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Mon, 24 Oct 2016 13:57:59 +0000 (+0100)
Subject: Merge branch 'master' into beryllium
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=9079822dd2d96f14dcd4cc94cc42bf3c0179558a;p=max%2Fdotfiles.git

Merge branch 'master' into beryllium
---

9079822dd2d96f14dcd4cc94cc42bf3c0179558a