Merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 01 Jun 2010 10:12:07 -0500
changeset 11256 94b7b3a1ae1b
parent 11253 d50e943a2acf (current diff)
parent 11255 e4dbaa40096d (diff)
child 11262 55226ceb0b2a
Merge with stable
mercurial/hg.py
mercurial/util.py