← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/jabberd2/oneiric

Viewing all changes in revision 16.

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2009-05-12 11:47:53 UTC
  • mfrom: (1.1.4 upstream) (0.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090512114753-jss6vqygkgnvtpbv
Tags: 2.2.8-1ubuntu1
* Merge from debian unstable, remaining changes:
 - debian/control:
    + Added Conflicts and Replaces: ..., jabber for jabberd2

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: