-
Committer:
Bazaar Package Importer
-
Author(s):
Daniel Holbach
-
Date:
2007-09-18 16:40:41 UTC
-
mfrom:
(1.1.6 upstream)
-
Revision ID:
james.westby@ubuntu.com-20070918164041-1h76ekcoj9kwj9vy
Tags: 2.20.0-1ubuntu1
* Merge with Debian, remaining Ubuntu changes:
- debian/control.in: differing Conflicts (it refers to a binNMU in
Debian).