diff hgext/zeroconf/__init__.py @ 21764:cd3c79392056

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2014 20:59:36 -0500
parents d57879e72e18
children 80c5b2666a96
line wrap: on
line diff