pidgin: b1ac628b: merge of '89a4f914ccc668cb5ef2e9d16cf165...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: b1ac628ba5bffb787d4758b2d9c76ddf14461738
Ancestor: 89a4f914ccc668cb5ef2e9d16cf1652efb275071
Ancestor: eb9385f349a20856b9d3f9911dbc8024caa44052
Author: qulogic at pidgin.im
Date: 2009-08-19T00:56:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b1ac628ba5bffb787d4758b2d9c76ddf14461738

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        finch/gntmedia.c finch/libgnt/configure.ac
        finch/plugins/gnttinyurl.c libpurple/certificate.c
        libpurple/ft.c libpurple/plugins/joinpart.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/error.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/yahoo/libymsg.c pidgin/gtkblist-theme.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkmain.c

ChangeLog: 

merge of '89a4f914ccc668cb5ef2e9d16cf1652efb275071'
     and 'eb9385f349a20856b9d3f9911dbc8024caa44052'