comparison mercurial/httppeer.py @ 20829:9a09a625bc93

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 25 Mar 2014 16:17:16 -0500
parents a07be8953733
children 167047ba3cfa
comparison
equal deleted inserted replaced
20828:3210b7930899 20829:9a09a625bc93