-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Thomas
-
Date:
2010-05-24 11:33:21 UTC
-
mfrom:
(2.2.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20100524113321-b9txnlnyl0ojuy9u
Tags: 1.3~beta1-1ubuntu1
* Merge from Debian Unstable, remaining changes:
- Add kubuntu_01_default_channels.diff, disable debian_channel.diff
- Keep message indicator patches, libindicator-dev build-dep
- Use the Kubuntu docpath (/usr/share/doc/kde)