Merge branch 'master' of github.com:dopefishh/dotfiles
authorMart Lubbers <mart@martlubbers.net>
Tue, 11 Oct 2016 15:45:30 +0000 (17:45 +0200)
committerMart Lubbers <mart@martlubbers.net>
Tue, 11 Oct 2016 15:45:30 +0000 (17:45 +0200)

Trivial merge