comparison hgext/zeroconf/Zeroconf.py @ 23266:3480c07fc934

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 11 Nov 2014 18:43:19 -0600
parents 31f32a96e1e3
children b502138f5faa
comparison
equal deleted inserted replaced
23263:dd51abf0aa17 23266:3480c07fc934