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

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6462 [merge]
revision-id: v.ladeuil+lp at free.fr-20120203102847-1ser8chmkqpy9514
parent: pqm at pqm.ubuntu.com-20120202234645-fyi3d7g2smosj6vo
parent: pqm at pqm.ubuntu.com-20120203095750-rvgsywx35nqn65n2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Fri 2012-02-03 11:28:47 +0100
message:
  Merge 2.5 branch
added:
  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
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
  po/bzr.pot                     bzr.pot-20110824141422-87q4lojt72ptqa9u-1
-------------- next part --------------

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