pidgin: eb9385f3: merge of '53b02d9c3c8aa71b13cea90eea22a0...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: eb9385f349a20856b9d3f9911dbc8024caa44052
Ancestor: 53b02d9c3c8aa71b13cea90eea22a0b60155dc8c
Ancestor: 7c150a3616a42da59174d4b392caadb4df5f0d2c
Author: qulogic at pidgin.im
Date: 2009-08-19T00:41:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/eb9385f349a20856b9d3f9911dbc8024caa44052

Modified files:
        ChangeLog configure.ac 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 '53b02d9c3c8aa71b13cea90eea22a0b60155dc8c'
     and '7c150a3616a42da59174d4b392caadb4df5f0d2c'