pidgin: dbcb9257: merge of '0caa39824f21f7f7dd7abf1462fbc7...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: dbcb9257acca0e581313eebc2b8dc4f98bf66103
Ancestor: 0caa39824f21f7f7dd7abf1462fbc769730120de
Ancestor: 6777479a003186b7b7e2e499eea0522c541b7a37
Author: markdoliner at pidgin.im
Date: 2008-03-16T20:37:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dbcb9257acca0e581313eebc2b8dc4f98bf66103

Modified files:
        ChangeLog libpurple/certificate.c libpurple/debug.h
        libpurple/dnsquery.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/qq_proxy.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/proxy.c
        libpurple/util.c pidgin/gtkblist.c pidgin/gtkmain.c

ChangeLog: 

merge of '0caa39824f21f7f7dd7abf1462fbc769730120de'
     and '6777479a003186b7b7e2e499eea0522c541b7a37'