Changeset ca60550 for protocols/jabber


Ignore:
Timestamp:
2008-02-16T15:58:22Z (16 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
4eb4c0f, a73e91a
Parents:
af97b23 (diff), fc5cf88 (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 Jelmer.

File:
1 edited

Legend:

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