Rev 6439: (vila) Merge 2.5 into trunk (Vincent Ladeuil) 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: 6439 [merge]
revision-id: pqm at pqm.ubuntu.com-20120116182647-fi4jy502195z8djm
parent: pqm at pqm.ubuntu.com-20120116142737-incpbjom3tqo3hdb
parent: v.ladeuil+lp at free.fr-20120116175743-ohoqm6cmht09u793
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2012-01-16 18:26:47 +0000
message:
  (vila) Merge 2.5 into trunk (Vincent Ladeuil)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
  po/bzr.pot                     bzr.pot-20110824141422-87q4lojt72ptqa9u-1

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