Rev 6497: Merge 2.5 in file:///home/vila/src/bzr/reviews/bug957049/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/bug957049/

------------------------------------------------------------
revno: 6497 [merge]
revision-id: v.ladeuil+lp at free.fr-20120801084841-jjvbbcs9p1rs64zd
parent: v.ladeuil+lp at free.fr-20120801084721-kkooywz7b16rhbny
parent: pqm at pqm.ubuntu.com-20120728124511-5wd5xu09u2v2nvpq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bug957049
timestamp: Wed 2012-08-01 10:48:41 +0200
message:
  Merge 2.5
added:
  po/cs.po                       cs.po-20120302043026-vqff3s7df762d2kt-148
  po/he.po                       he.po-20120306043036-ybz0jicnuuojzc33-16
  po/my.po                       my.po-20120519043321-rfqzcttk3aonkz4j-13
  po/nb.po                       nb.po-20120404043310-3jh1368zbvc26azt-13
  po/sv.po                       sv.po-20120424043047-t8y2xew1uahfo1vo-60
  po/vi.po                       vi.po-20120310043631-lupcconmf2x3pwi5-19
modified:
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/_walkdirs_win32.pyx     _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/gpg.py                  gpg.py-20051017065112-8654536d415dacc6
  bzrlib/i18n.py                 i18n.py-20110429130428-eblvodng604h3dzi-1
  bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_rmbranch.py test_rmbranch.py-20100131150653-auenl06hu4y2d9tr-1
  bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
  bzrlib/tests/per_interrepository/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
  bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
  bzrlib/tests/test_gpg.py       testgpg.py-20051017042228-9276cd40a784c93c
  bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
  doc/en/whats-new/whats-new-in-2.5.txt whatsnewin2.5.txt-20110711065040-xz9b4xba1qzlwp7m-1
  po/de.po                       de.po-20120117043917-vltlddz1d722pcxo-33
  po/pt_BR.po                    pt_br.po-20120117043917-vltlddz1d722pcxo-43
-------------- next part --------------

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