Viewing all changes in revision 4797.17.1.

Committer: Andrew Bennetts
Date: 2010-02-12 01:35:24 UTC
mfrom: <a title="Merged From 4634.130.2" href="/~bzr-pqm/bzr/bzr.dev/revision/4634.130.2?remember=4634.39.44">(4634.130.2 alias-loc-docs)
mto: <a title="Merged In 4797.18.1" href="/~bzr-pqm/bzr/bzr.dev/revision/4797.18.1?remember=4634.39.44">(4797.18.1 merge-2.0-into-2.1)
mto: This revision was merged to the branch mainline in revision 5033 .
Revision ID: andrew.bennetts@canonical.com-20100212013524-57qvmp7nmi4rylzf

Merge alias-loc-docs-337834 (which was against lp:bzr/2.0).

added added

removed removed