From: Mart Lubbers Date: Sat, 20 Aug 2016 11:58:16 +0000 (+0200) Subject: Merge branch 'master' into laptop X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=ae833e18bdf78a15ff3db3c1c616ee5a0850273d;p=dotfiles.git Merge branch 'master' into laptop --- ae833e18bdf78a15ff3db3c1c616ee5a0850273d