pidgin: 7c0f8ebe: merge of '16bc7e72b5dd239ce65c63a388c2d3...

Wed Jul 22 03:36:02 EDT 2009

-----------------------------------------------------------------
Revision: 7c0f8ebeda0f59bd50e8e1692886616f302badcf
Ancestor: 16bc7e72b5dd239ce65c63a388c2d39efc5b7c32
Ancestor: 31cfeb857db37f5ed2d12cf084073349436c89e5
Author: darkrain42 at pidgin.im
Date: 2009-07-22T04:15:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7c0f8ebeda0f59bd50e8e1692886616f302badcf

Modified files:
        libpurple/blist.c libpurple/certificate.c
        libpurple/mediamanager.c libpurple/protocols/jabber/jabber.c
        libpurple/win32/targets.mak pidgin/gtkblist.c

ChangeLog: 

merge of '16bc7e72b5dd239ce65c63a388c2d39efc5b7c32'
     and '31cfeb857db37f5ed2d12cf084073349436c89e5'