Merge lp:~roadmr/ubuntu/natty/casper/709364 into lp:ubuntu/natty/casper
Proposed by
Daniel Manrique
Status: | Merged |
---|---|
Merged at revision: | 858 |
Proposed branch: | lp:~roadmr/ubuntu/natty/casper/709364 |
Merge into: | lp:ubuntu/natty/casper |
Diff against target: |
49 lines (+16/-2) (has conflicts) 2 files modified
debian/changelog (+11/-0) scripts/casper-bottom/23networking (+5/-2) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp:~roadmr/ubuntu/natty/casper/709364 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson | Approve | ||
Review via email: mp+47865@code.launchpad.net |
To post a comment you must log in.