pidgin: b81c3df4: merge of 'dd536145a4036177cabc4e4e1ac83d...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: b81c3df47e99fb60caede8d8fdabc2a4796cbea1
Ancestor: dd536145a4036177cabc4e4e1ac83dcdf1008a33
Ancestor: fdb452e89c3d4140034ff12f06a8c3daf350ae5d
Author: rekkanoryo at pidgin.im
Date: 2008-12-11T22:36:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b81c3df47e99fb60caede8d8fdabc2a4796cbea1

Modified files:
        COPYRIGHT ChangeLog libpurple/account.c
        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/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/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_opt.c
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        pidgin/plugins/perl/common/GtkIMHtml.xs

ChangeLog: 

merge of 'dd536145a4036177cabc4e4e1ac83dcdf1008a33'
     and 'fdb452e89c3d4140034ff12f06a8c3daf350ae5d'