Changeset b006464 for protocols/nogaim.c

Timestamp:
2012-11-17T23:51:21Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5aa96fc8
Parents:
d1356cb (diff), e1d3f98 (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 mainline.

(No files)

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