Rev 6475: Merge 2.5 branch in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6475 [merge]
revision-id: v.ladeuil+lp at free.fr-20120224125051-i7p1xmjxw56jhmj3
parent: pqm at pqm.ubuntu.com-20120223193907-11erj8xxjmrchawp
parent: pqm at pqm.ubuntu.com-20120224124401-7iht0m0nkx2l2ru9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2012-02-24 13:50:51 +0100
message:
  Merge 2.5 branch
added:
  po/ar.po                       ar.po-20120222043031-v04m0edl209lnipt-11
  po/pl.po                       pl.po-20120223043037-yvxlhv2dzl5j5sh6-8
  po/ug.po                       ug.po-20120218043033-wd8k7jfxi60naj5e-34
modified:
  bzrlib/doc_generate/builders/texinfo.py texinfo_builder.py-20100428165122-t24toqlqz1nxzsc0-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
  po/ast.po                      ast.po-20120117043917-vltlddz1d722pcxo-27
  po/bs.po                       bs.po-20120117043917-vltlddz1d722pcxo-28
  po/ca.po                       ca.po-20120117043917-vltlddz1d722pcxo-29
  po/de.po                       de.po-20120117043917-vltlddz1d722pcxo-33
  po/en_AU.po                    en_au.po-20120117043917-vltlddz1d722pcxo-45
  po/en_GB.po                    en_gb.po-20120117043917-vltlddz1d722pcxo-44
  po/es.po                       es.po-20120117043917-vltlddz1d722pcxo-41
  po/fo.po                       fo.po-20120117043917-vltlddz1d722pcxo-31
  po/fr.po                       fr.po-20120117043917-vltlddz1d722pcxo-32
  po/gl.po                       gl.po-20120117043917-vltlddz1d722pcxo-34
  po/it.po                       it.po-20120117043917-vltlddz1d722pcxo-35
  po/ja.po                       ja.po-20120117043917-vltlddz1d722pcxo-36
  po/ms.po                       ms.po-20120117043917-vltlddz1d722pcxo-37
  po/nl.po                       nl.po-20120117043917-vltlddz1d722pcxo-30
  po/oc.po                       oc.po-20120127043041-eea0ff54xu335nit-95
  po/pt_BR.po                    pt_br.po-20120117043917-vltlddz1d722pcxo-43
  po/ro.po                       ro.po-20120117043917-vltlddz1d722pcxo-38
  po/ru.po                       ru.po-20120117043917-vltlddz1d722pcxo-39
  po/sco.po                      sco.po-20120117043917-vltlddz1d722pcxo-40
  po/tr.po                       tr.po-20120117043917-vltlddz1d722pcxo-42
-------------- next part --------------

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