Rev 6350: (vila) Release 2.5b4 (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: 6350 [merge]
revision-id: pqm at pqm.ubuntu.com-20111208092058-vyugbu7jru6dp426
parent: pqm at pqm.ubuntu.com-20111206163008-eoqz60dpbysebble
parent: v.ladeuil+lp at free.fr-20111208083236-3cedhs5m0ph6hamk
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-12-08 09:20:58 +0000
message:
  (vila) Release 2.5b4 (Vincent Ladeuil)
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/plugins/po_merge/tests/test_po_merge.py test_blackbox_po_mer-20111123180440-la918t6t068pzacx-7
  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 (7839 lines, the limit is 1000).