Changeset a3a3778 for protocols/jabber


Ignore:
Timestamp:
2006-12-22T17:17:08Z (16 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5c5a586, 9225e08
Parents:
55078f5 (diff), bd28e6a (diff), a51be64 (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:

Merging trees.

File:
1 edited

Legend:

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