Changeset 62a2bf9 for protocols/nogaim.h

Timestamp:
2013-01-05T13:47:56Z (12 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
cfbecc9
Parents:
e6298e5 (diff), 757e1e0 (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.

(No files)

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