Rev 4008: Merge the 1.11-final into bzr.dev (no changes, just grabbing the tip rev) in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 4008
revision-id: john at arbash-meinel.com-20090213212416-xdvzbxf0ld5a5cxj
parent: john at arbash-meinel.com-20090213212125-aiqf2d1as2pd2xy2
parent: pqm at pqm.ubuntu.com-20090119122508-t03dqq4axqfag58c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2009-02-13 15:24:16 -0600
message:
  Merge the 1.11-final into bzr.dev (no changes, just grabbing the tip rev)
    ------------------------------------------------------------
    revno: 3932.7.2
    tags: bzr-1.11
    revision-id: pqm at pqm.ubuntu.com-20090119122508-t03dqq4axqfag58c
    parent: pqm at pqm.ubuntu.com-20090115082637-f802qau8az1f5awi
    parent: mbp at sourcefrog.net-20090119113338-81srt3d42gpqyhqb
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.11
    timestamp: Mon 2009-01-19 12:25:08 +0000
    message:
      (mbp) prepare 1.11final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3932.7.1
    revision-id: pqm at pqm.ubuntu.com-20090115082637-f802qau8az1f5awi
    parent: pqm at pqm.ubuntu.com-20090114230346-i9lm6l9v3gz8zzeu
    parent: mbp at sourcefrog.net-20090115074041-a4im46in3f8cb1vd
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.11
    timestamp: Thu 2009-01-15 08:26:37 +0000
    message:
      (mbp, for vila) Fix failing test when CompiledChunksToLines is not available.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
-------------- next part --------------