pidgin: e98c1913: merge of '0303b668a76bd19395d6a4feeec2d0...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: e98c1913381ed0f38c1f71d173d3ba75bb9f895d
Ancestor: 0303b668a76bd19395d6a4feeec2d0c36f2407bf
Ancestor: c9da05d4c46b4bbb646f099c087df91cb3b27ab1
Author: markdoliner at pidgin.im
Date: 2009-07-30T07:26:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e98c1913381ed0f38c1f71d173d3ba75bb9f895d

Modified files:
        libpurple/certificate.c libpurple/protocols/jabber/buddy.c
        libpurple/protocols/oscar/family_locate.c

ChangeLog: 

merge of '0303b668a76bd19395d6a4feeec2d0c36f2407bf'
     and 'c9da05d4c46b4bbb646f099c087df91cb3b27ab1'