Changeset e8a6211 for protocols/jabber

Timestamp:
2006-10-22T17:00:15Z (17 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
f0071b7
Parents:
66f783f (diff), 6237ded (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from main tree.

(No files)

Note: See TracChangeset for help on using the changeset viewer.