comparison hgext/zeroconf/__init__.py @ 28670:ff0d3b6b287f

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 29 Mar 2016 12:29:00 -0500
parents 4de74eda1d65
children d5883fd055c6
comparison
equal deleted inserted replaced
28669:c4b727795d6a 28670:ff0d3b6b287f