mercurial: minor update, add upstream patch
Merge pull request #809 from pyhalov/mercurial

mercurial: minor update, add upstream patch