[Merge] lp:~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311 into lp:ubuntu/libotr

[James Westby]

James Westby has proposed merging lp:~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311 into lp:ubuntu/libotr.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)

For more details, see:
https://code.launchpad.net/~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311/+merge/54971

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/libotr now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311. A merge should be performed if necessary.
-- 
https://code.launchpad.net/~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311/+merge/54971
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~ubuntu-branches/ubuntu/natty/libotr/natty-201103260311 into lp:ubuntu/libotr.