Fixes to mercurial extensions
Merge branch 'master' of github.com:aquatix/dotfiles