Merged with default protocol5

Eliminated unnecessary difference to the protocol5 branch

(0) -100 -30 -10 -2 +2 +10 +30 tip

mercurial