Merge lp:~ubuntu-branches/ubuntu/lucid/atheist/lucid-201002122355 into lp:ubuntu/lucid/atheist

Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/atheist/lucid-201002122355
Merge into: lp:ubuntu/lucid/atheist
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/atheist/lucid-201002122355
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/lucid/atheist now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/atheist/lucid-201002122355. A merge should be performed if necessary.

Unmerged revisions

5. By teresa <teresa@teresa-laptop>

Fix FTBFS: also build for python versions after 2.5 (LP: #506240)

Subscribers

People subscribed via source and target branches

to all changes: