~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 2420.2.1.

Merge smart server changes that are already with PQM, and fix conflict and formatting nit in NEWS.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: