Rev 5660: Merge 2.2 into 2.3 (including fix for #614713, #609187 and #812928) in http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

------------------------------------------------------------
revno: 5660 [merge]
revision-id: v.ladeuil+lp at free.fr-20110820092827-9dyakfslp0r3hb1k
parent: pqm at pqm.ubuntu.com-20110801054736-0s5zojh4cscoxnoj
parent: pqm at pqm.ubuntu.com-20110820090216-xrqcq4me2nstw4to
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3.4-dev
timestamp: Sat 2011-08-20 11:28:27 +0200
message:
  Merge 2.2 into 2.3 (including fix for #614713, #609187 and #812928)
added:
  bzrlib/plugins/launchpad/lp_api_lite.py lp_api_lite.py-20110712150258-dfa3tq91bz14r5ww-1
  bzrlib/plugins/launchpad/test_lp_api_lite.py test_lp_api_lite.py-20110713114529-lurqfgc09yifvs3u-1
modified:
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  doc/en/release-notes/bzr-2.0.txt bzr2.0.txt-20101008081016-21wd86gpfhllpue3-37
  doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38
-------------- next part --------------

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