~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-01-13 11:31:33 UTC
mfrom: <a title="Merged From 6015.53.1" href="/~bzr-pqm/bzr/bzr.dev/revision/6015.53.1?remember=6449.5.3">(6015.53.1 2.4.3-dev)
mto: <a title="Merged In 6437.2.1" href="/~bzr-pqm/bzr/bzr.dev/revision/6437.2.1?remember=6449.5.3">(6437.2.1 2.5b5-dev) <a title="Merged In 6015.57.1" href="/~bzr-pqm/bzr/bzr.dev/revision/6015.57.1?remember=6449.5.3">(6015.57.1 2.4)
mto: This revision was merged to the branch mainline in revision 6439 .
Revision ID: pqm@pqm.ubuntu.com-20120113113133-eh846y7w12s9hm9s

(vila) Merge 2.3 into 2.4 (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)