# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1304684993 -7200
# Node ID 680c3c6fcb48652ac982b568430ab8a9f03e857f
# Parent  21b8ce4d33318dc916659bd62c706cdfadf7eb34# Parent  7b627923739f1f22b9ef30e203d366d5de656a91
merge with stable

The change from 7b627923739f (parent 2) is not needed after switching
to the new url parser.

diff -r 21b8ce4d3331 -r 680c3c6fcb48 mercurial/subrepo.py