[Merge] lp:~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137 into lp:ubuntu/lucid/duplicity

[James Westby]

James Westby has proposed merging lp:~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137 into lp:ubuntu/lucid/duplicity.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)

For more details, see:
https://code.launchpad.net/~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137/+merge/62812

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/duplicity now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137. A merge should be performed if necessary.
-- 
https://code.launchpad.net/~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137/+merge/62812
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137 into lp:ubuntu/lucid/duplicity.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 271549 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20110530/887ea348/attachment-0001.diff>