Merge branch 'master' of github.com:dopefishh/dotfiles
authorMart Lubbers <mart@martlubbers.net>
Thu, 2 Feb 2017 13:40:26 +0000 (14:40 +0100)
committerMart Lubbers <mart@martlubbers.net>
Thu, 2 Feb 2017 13:40:26 +0000 (14:40 +0100)

Trivial merge