diffpaste!
Merge branch 'master' of github.com:pharpend/dotfiles