-
Committer:
Bazaar Package Importer
-
Author(s):
Stephan Hermann
-
Date:
2009-06-04 06:40:19 UTC
-
mfrom:
(0.1.6 sid)
-
Revision ID:
james.westby@ubuntu.com-20090604064019-400dervkxx5p8iwt
Tags: 2.2.8-2ubuntu1
* Merge from debian unstable, remaining changes:
- debian/control:
+ Added Conflicts and Replaces: ..., jabber for jabberd2