~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-01-16 16:21:42 UTC
mfrom: (6437.2.1 2.5b5-dev)
mto: (6437.8.1 2.5.0-dev) (6438.1.2 trunk) (6436.3.3 hpss-get-branches) (6434.1.2 bzr-pypy) (6402.3.9 safe-open) (6240.5.8 pre_post_command_hooks) (6379.13.2 fix-branch-into-empty-bzrdir) (6228.3.6 revhistory-matcher) (6238.2.26 urllib-verifies-ssl-certs) (6443.1.1 bzr.dev) (6352.4.2 get-seeks-backwards) (6445.1.1 trunk) (6159.2.5 bzr) (6450.1.1 bzr.dev) (6457.1.1 trunk) (6461.1.1 trunk) (6468.1.1 merge-2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6439.
Revision ID: pqm@pqm.ubuntu.com-20120116162142-tkppbzpcvwtrvxnd

(vila) Merge 2.4 into 2.5 (Vincent Ladeuil)

added added

removed removed

* Cope cleanly with buggy HTTP proxies that close the socket in the middle

of a multipart response. (Martin Pool, #198646).

* cStringIO is now unconditionally imported in ``bzrlib.config``.

(Jelmer Vernooij, #905361)

* Fix "Unprintable exception" error when a RetryWithNewPacks error is

displayed. (Andrew Bennetts)