~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 4797.18.1.

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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: