comparison hgext/zeroconf/Zeroconf.py @ 17175:f76e2196ee70

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Jul 2012 14:48:50 -0500
parents 7de7630053cb
children e7cfe3587ea4 210acc861c40
comparison
equal deleted inserted replaced
17173:c621f84dbb35 17175:f76e2196ee70