Rev 6525: (jelmer) Merge 2.5. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6525 [merge]
revision-id: pqm at pqm.ubuntu.com-20120618125919-jf2dy5p1apoljtan
parent: pqm at pqm.ubuntu.com-20120516092351-juhkm3zdl63nod8b
parent: jelmer at samba.org-20120618114307-zeazlym311p38m98
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2012-06-18 12:59:19 +0000
message:
  (jelmer) Merge 2.5. (Jelmer Vernooij)
added:
  po/cs.po                       cs.po-20120618113655-rw8celv88kc47gs2-1
  po/he.po                       he.po-20120618113655-rw8celv88kc47gs2-2
  po/my.po                       my.po-20120618113655-rw8celv88kc47gs2-3
  po/nb.po                       nb.po-20120618113655-rw8celv88kc47gs2-4
  po/sv.po                       sv.po-20120618113655-rw8celv88kc47gs2-5
  po/vi.po                       vi.po-20120618113655-rw8celv88kc47gs2-6
modified:
  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_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
  bzrlib/tests/per_interrepository/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
  bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
  bzrlib/tests/test_setup.py     test_setup.py-20051208073730-4a59a6368c4efa04
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  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

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