Rev 6351: Merge trunk before adding news entry in file:///home/vila/src/bzr/bugs/832064-default-value-callable/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/832064-default-value-callable/

------------------------------------------------------------
revno: 6351 [merge]
revision-id: v.ladeuil+lp at free.fr-20111209161552-3s3tkjvn78e1e6kg
parent: v.ladeuil+lp at free.fr-20111209161532-ktm62xw0euieo7wj
parent: pqm at pqm.ubuntu.com-20111209134805-vmudt1kfpmoatf5f
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 832064-default-value-callable
timestamp: Fri 2011-12-09 17:15:52 +0100
message:
  Merge trunk before adding news entry
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/plugins/po_merge/tests/test_po_merge.py test_blackbox_po_mer-20111123180440-la918t6t068pzacx-7
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  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 (7918 lines, the limit is 1000).