From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 26 Oct 2016 15:40:08 +0000 (+0100)
Subject: Merge branch 'master' into beryllium
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=30004b962984085b3dc8fad9e2e538abd4c79ec4;hp=--cc;p=max%2Fdotfiles.git

Merge branch 'master' into beryllium
---

30004b962984085b3dc8fad9e2e538abd4c79ec4