pidgin: 5b8e41cb: merge of '17b584b23aee26cc5553b12483ab9b...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 5b8e41cbf04a482736fb89de8e8c1013c4817798
Ancestor: 17b584b23aee26cc5553b12483ab9b550eee8103
Ancestor: 2b3429067be9bc2eb9be9e8deeeac9c35001f61d
Author: rekkanoryo at pidgin.im
Date: 2008-12-11T06:24:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5b8e41cbf04a482736fb89de8e8c1013c4817798

Modified files:
        COPYRIGHT ChangeLog ChangeLog.win32 finch/gntaccount.c
        finch/gntroomlist.c libpurple/account.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/char_conv.h
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_im.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/im.c libpurple/protocols/qq/im.h
        libpurple/protocols/qq/packet_parse.c
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_define.c
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/qq/utils.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/zephyr/zephyr.c libpurple/roomlist.c
        libpurple/win32/global.mak pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkroomlist.c pidgin/gtkutils.c

ChangeLog: 

merge of '17b584b23aee26cc5553b12483ab9b550eee8103'
     and '2b3429067be9bc2eb9be9e8deeeac9c35001f61d'