Rev 6439: (vila) Release 2.5b5 (Vincent Ladeuil) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.5/

------------------------------------------------------------
revno: 6439 [merge]
revision-id: pqm at pqm.ubuntu.com-20120116165831-f7fl4a0ywaj9lazx
parent: pqm at pqm.ubuntu.com-20120116162142-tkppbzpcvwtrvxnd
parent: v.ladeuil+lp at free.fr-20120116144548-48mob8d7dee824uc
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.5
timestamp: Mon 2012-01-16 16:58:31 +0000
message:
  (vila) Release 2.5b5 (Vincent Ladeuil)
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  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 (9874 lines, the limit is 1000).