From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 24 Oct 2016 16:21:31 +0000 (+0100)
Subject: Merge branch 'master' into beryllium
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=0a4160b7d8128ad2d73671654df1599ef0a64c77;p=max%2Fdotfiles.git

Merge branch 'master' into beryllium
---

0a4160b7d8128ad2d73671654df1599ef0a64c77