Rev 5950: Merge trunk resolving conflict in news in file:///home/vila/src/bzr/bugs/781140-ftp-test-coverage/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/781140-ftp-test-coverage/

------------------------------------------------------------
revno: 5950 [merge]
revision-id: v.ladeuil+lp at free.fr-20110607082021-4wt3mlh9mqsn0djg
parent: v.ladeuil+lp at free.fr-20110607070546-zizepv2bvtz171s5
parent: pqm at pqm.ubuntu.com-20110606125209-j8r8jiltfjypii3i
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 781140-ftp-test-coverage
timestamp: Tue 2011-06-07 10:20:21 +0200
message:
  Merge trunk resolving conflict in news
modified:
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/groupcompress.py        groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_import_tariff.py test_import_tariff.p-20100207155145-ff9infp7goncs7zh-1
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  doc/developers/code-review.txt codereview.txt-20100512110229-wywsv1livg919f1f-1
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
-------------- next part --------------

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