pidgin: d5bb2913: merge of '6de8f788571b507b2c76125cc65f88...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: d5bb29138cbe033bbfd8ec689203d73818765327
Ancestor: 6de8f788571b507b2c76125cc65f88db49c60790
Ancestor: 9b445b58d5e8b6ea8a6564f20865c206fce08d5a
Author: sadrul at pidgin.im
Date: 2008-12-11T21:12:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d5bb29138cbe033bbfd8ec689203d73818765327

Modified files:
        ChangeLog libpurple/account.c libpurple/blist.h
        libpurple/cmds.h libpurple/connection.h
        libpurple/conversation.h
        libpurple/plugins/perl/common/Account.xs
        libpurple/plugins/perl/common/AccountOpts.xs
        libpurple/plugins/perl/common/Conversation.xs
        libpurple/plugins/perl/common/Prefs.xs
        libpurple/plugins/perl/common/Roomlist.xs
        libpurple/plugins/perl/common/Status.xs
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/buddy_opt.h
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group.h
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/im.h libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc10/wb.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.h
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        libpurple/smiley.c pidgin/gtkutils.c
        pidgin/plugins/perl/common/GtkIMHtml.xs

ChangeLog: 

merge of '6de8f788571b507b2c76125cc65f88db49c60790'
     and '9b445b58d5e8b6ea8a6564f20865c206fce08d5a'