merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 20 Dec 2010 15:27:15 -0600
changeset 13184 f16b3b1a2234
parent 13182 2537bd17421d (current diff)
parent 13183 f9d29777b4eb (diff)
child 13186 fda7ae939344
merge with stable
mercurial/url.py