Merge lp:~ubuntu-branches/ubuntu/karmic/zsync/karmic-201002130256 into lp:ubuntu/karmic/zsync

Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/karmic/zsync/karmic-201002130256
Merge into: lp:ubuntu/karmic/zsync
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/karmic/zsync/karmic-201002130256
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/karmic/zsync now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/karmic/zsync/karmic-201002130256. A merge should be performed if necessary.

Unmerged revisions

11. By James Westby

http.c: fixup offsets that are larger than signed ints (LP: #420931)

Subscribers

People subscribed via source and target branches

to all changes: