-
Committer:
Bazaar Package Importer
-
Author(s):
Sarah Hobbs
-
Date:
2008-11-04 13:23:34 UTC
-
Revision ID:
james.westby@ubuntu.com-20081104132334-6bgyscmnnavdgzx4
Tags: 1.1-0ubuntu3
* Reapply kubuntu_05_default_channels.diff dropped in 1.0.1-6ubuntu1.
* Removed 10_debian_channel.diff added in 1.0.1-6ubuntu1.
* Re-add missing changelog entries that went into a black hole.
* Kubuntu people now go to #kubuntu, not #debian again (LP: #218958),
even without kubuntu-default-settings installed.
* This merge should now be correct.