Rev 4884: Merge 2.1-categorize-requests-819604 in http://bazaar.launchpad.net/~jameinel/bzr/2.1-all-reconnect-819604

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1-all-reconnect-819604

------------------------------------------------------------
revno: 4884 [merge]
revision-id: john at arbash-meinel.com-20120912070702-frcohrl82jacgvq1
parent: pqm at pqm.ubuntu.com-20120327194850-u6m9t5vv8rd1stak
parent: john at arbash-meinel.com-20111010125843-ntwjed4qrt2h9xaq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-all-reconnect-819604
timestamp: Wed 2012-09-12 11:07:02 +0400
message:
  Merge 2.1-categorize-requests-819604
modified:
  bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
  bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
-------------- next part --------------

Diff too large for email (1223 lines, the limit is 1000).