Rev 6440: Merge 2.5 into trunk in http://bazaar.launchpad.net/~vila/bzr/integration/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 6440 [merge]
revision-id: v.ladeuil+lp at free.fr-20120116175743-ohoqm6cmht09u793
parent: v.ladeuil+lp at free.fr-20120116173046-jflztzmy16fwu1wz
parent: pqm at pqm.ubuntu.com-20120116175333-gp8qn6lsebi5c978
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2012-01-16 18:57:43 +0100
message:
  Merge 2.5 into trunk
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  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
-------------- next part --------------

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