Merge branch 'master' of github.com:dopefishh/dotfiles
authorMart Lubbers <mart@martlubbers.net>
Wed, 11 Jun 2014 08:01:01 +0000 (10:01 +0200)
committerMart Lubbers <mart@martlubbers.net>
Wed, 11 Jun 2014 08:01:01 +0000 (10:01 +0200)

Trivial merge