-
Committer:
Bazaar Package Importer
-
Author(s):
Adam Conrad
-
Date:
2005-07-21 17:53:23 UTC
-
mfrom:
(0.1.1 upstream)
-
Revision ID:
james.westby@ubuntu.com-20050721175323-m3oh6aoigywohfnq
Tags: 3.0.14a-6ubuntu1
Resynchronise with Debian, resolving merge conflicts (#12360)