Merge branch 'master' of https://github.com/dopefishh/dotfiles
authorMart Lubbers <mart@martlubbers.net>
Mon, 10 Mar 2014 21:59:36 +0000 (22:59 +0100)
committerMart Lubbers <mart@martlubbers.net>
Mon, 10 Mar 2014 21:59:36 +0000 (22:59 +0100)
commit5223e76a4302c4de131593feea3987398c60445d
treea0f8aaf6438ad1643e12ff8eb8c2c9743ffd1a0d
parent336b6c6c69a03210ca9f666e82de17503a129045
parent35592efa3b150a2efcb320ffb12aaa66e2c1f43c
Merge branch 'master' of https://github.com/dopefishh/dotfiles

Conflicts:
README.md
install
muttrc
README.md
install
muttrc