Merge lp:~ubuntu-branches/ubuntu/lucid/user-setup/lucid-201002122356 into lp:ubuntu/lucid/user-setup
Proposed by
James Westby
Status: | Needs review |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/lucid/user-setup/lucid-201002122356 |
Merge into: | lp:ubuntu/lucid/user-setup |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/lucid/user-setup/lucid-201002122356 |
Related bugs: |
To post a comment you must log in.
Unmerged revisions
- 78. By Mario Limonciello
-
releasing version 1.28ubuntu3
- 77. By Mario Limonciello
-
Fix automatic login on situations where custom.conf didn't exist
already on the target.
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/user-setup now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/user-setup/lucid-201002122356. A merge should be performed if necessary.