Revision 5818cbd5fe95d6a167f1555b882526f36790b141

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 5818cbd5fe95d6a167f1555b882526f36790b141
Ancestor: 23dc0b8b764a7a920891d3024bb830bb14916013
Ancestor: 5c4412b272d4bbf2942716f8b4fd67890035dab7
Author: sadrul at pidgin.im
Date: 2007-09-10T04:47:14
Branch: im.pidgin.pidgin

Modified files:
        doc/SIGNAL-HOWTO.dox libpurple/certificate.c
        libpurple/conversation.h libpurple/notify.h
        libpurple/prefs.c libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c libpurple/server.h
        pidgin/gtkblist.h pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkutils.h pidgin/pixmaps/logo.png
        pidgin/plugins/win32/transparency/win2ktrans.c

ChangeLog: 

merge of '23dc0b8b764a7a920891d3024bb830bb14916013'
     and '5c4412b272d4bbf2942716f8b4fd67890035dab7'


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