Viewing all changes in revision 4797.18.1.

Committer: Andrew Bennetts
Date: 2010-02-12 06:15:11 UTC
mfrom: <a title="Merged From 4797.17.1" href="/~bzr-pqm/bzr/bzr.dev/revision/4797.17.1?remember=4634.125.2">(4797.17.1 alias-loc-docs-337834-2.1)
mto: <a title="Merged In 4797.2.15" href="/~bzr-pqm/bzr/bzr.dev/revision/4797.2.15?remember=4634.125.2">(4797.2.15 2.1)
mto: This revision was merged to the branch mainline in revision 5033 .
Revision ID: andrew.bennetts@canonical.com-20100212061511-n20wwmmy8tb0eemg

Merge alias-loc-docs-337834-2.1, which has already resolved the 2.0 vs. 2.1 conflicts for that patch.

added added

removed removed