Revision f7687aed5d4c60018282a0629b67556f506ceb54

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: f7687aed5d4c60018282a0629b67556f506ceb54
Ancestor: b23d43806fbfeabc5007c65090195a3aa6c0a4d9
Ancestor: d0782be8e7c4cb4e98375f4b90f47a931e782ec0
Author: sadrul at pidgin.im
Date: 2007-09-26T10:35:37
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/oscar.c pidgin/gtkutils.c

ChangeLog: 

merge of 'b23d43806fbfeabc5007c65090195a3aa6c0a4d9'
     and 'd0782be8e7c4cb4e98375f4b90f47a931e782ec0'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from f7687aed5d4c60018282a0629b67556f506ceb54