~bzr-pqm/bzr/bzr.dev

Committer: Vincent Ladeuil
Date: 2011-08-20 09:28:27 UTC
mfrom: <a title="Merged From 5050.78.2" href="/~bzr-pqm/bzr/bzr.dev/revision/5050.78.2?remember=6616.1.1">(5050.78.2 2.2)
mto: <a title="Merged In 5609.48.8" href="/~bzr-pqm/bzr/bzr.dev/revision/5609.48.8?remember=6616.1.1">(5609.48.8 2.3)
mto: This revision was merged to the branch mainline in revision 6090 .
Revision ID: v.ladeuil+lp@free.fr-20110820092827-9dyakfslp0r3hb1k

Merge 2.2 into 2.3 (including fix for #614713, #609187 and #812928)

added added

removed removed

* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii

path on windows from symlink support addition. (Martin [gz], #686611)

* Fix activity reporting for pycurl when using https with some

implementations of curl. (Vincent Ladeuil, #614713)

Improvements

************