# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1362110317 21600
# Node ID a07be895373394be66ba38b1ff111e26aca03ac8
# Parent  af9ddea2cb99b6e4314a6e79b793b5fc30ea4f19# Parent  b376e8f91c16c949ff37e402e9020e77d76bad15
merge with crew

diff -r af9ddea2cb99 -r a07be8953733 mercurial/httppeer.py