pidgin: 7cbc752a: merge of '01d5e162e0d796e96df727bb20f12c...

Thu Jul 16 01:20:37 EDT 2009

-----------------------------------------------------------------
Revision: 7cbc752a8f08158849396dab8039719a06b82ea9
Ancestor: 01d5e162e0d796e96df727bb20f12c2e2bfdd3d0
Ancestor: f09b8fa2cb4486c1ddd4fbc6343caac76d3134a8
Author: qulogic at pidgin.im
Date: 2009-07-16T05:17:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7cbc752a8f08158849396dab8039719a06b82ea9

Modified files:
        ChangeLog ChangeLog.API libpurple/blist.c
        libpurple/certificate.c libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/sslconn.c
        libpurple/sslconn.h libpurple/tests/test_jabber_jutil.c
        pidgin/gtkdialogs.c pidgin/gtkutils.c

ChangeLog: 

merge of '01d5e162e0d796e96df727bb20f12c2e2bfdd3d0'
     and 'f09b8fa2cb4486c1ddd4fbc6343caac76d3134a8'