-
Committer:
Bazaar Package Importer
-
Author(s):
Colin Watson
-
Date:
2011-05-03 14:40:12 UTC
-
mfrom:
(1.1.9 sid)
-
Revision ID:
james.westby@ubuntu.com-20110503144012-1x2boxvnat2ldt7i
Tags: 1.34ubuntu1
* Resynchronise with Debian. Remaining changes:
- Minor Ubuntu branding.
- Update cdrom/suite choices for Ubuntu.
* Add oneiric to cdrom/suite Choices; drop karmic.