mutt update
Merge branch 'master' of github.com:bcaccinolo/dotfiles
Merge branch 'master' of github.com:bcaccinolo/dotfiles

Conflicts:
	.mutt/muttrc