Changeset 5ffa4f7 for protocols/oscar

Timestamp:
2012-07-20T22:18:08Z (12 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
809cd37
Parents:
7d2ce9a (diff), 1a0b734 (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 vmiklos, should fox #979.

(No files)

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