From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 2 Feb 2017 13:40:26 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;ds=sidebyside;h=b7e21dda8ea9651dc0ff934cd6bb852dcb579616;p=dotfiles.git

Merge branch 'master' of github.com:dopefishh/dotfiles
---

b7e21dda8ea9651dc0ff934cd6bb852dcb579616