merge with stable
authorMatt Mackall <mpm@selenic.com>
Wed, 06 Apr 2011 15:14:51 -0500
changeset 13902 fab10e7cacd6
parent 13895 e4ffb9576b63 (current diff)
parent 13901 d3890ead75be (diff)
child 13903 a6c69abd91a0
merge with stable
mercurial/url.py