-
Committer:
Bazaar Package Importer
-
Author(s):
Jonathan Riddell
-
Date:
2008-11-19 15:57:20 UTC
-
mfrom:
(1.1.23 upstream)
(0.1.3 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081119155720-iqc2cc4x76u601og
Tags: 3.1.4+dfsg.1-1ubuntu1
* Merge with Debian, remaining changes:
 - Use Kubuntu's kde4.mk
 - Add replaces/conflicts on ktorrent-kde4