pidgin: d2dbd7f0: merge of '9d9dfe16667a3946233ae2a359de88...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: d2dbd7f0d39dd93bea84f6d372d7f0c2dc824cd0
Ancestor: 9d9dfe16667a3946233ae2a359de8856ee105289
Ancestor: f5de7408fa8d5aed024aaa8c74d7a2d692816b21
Author: khc at pidgin.im
Date: 2008-12-15T00:09:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d2dbd7f0d39dd93bea84f6d372d7f0c2dc824cd0

Deleted entries:
        libpurple/protocols/myspace/CHANGES
        libpurple/protocols/myspace/ChangeLog
        libpurple/protocols/myspace/LICENSE
        libpurple/protocols/myspace/release.sh
Modified files:
        COPYING COPYRIGHT ChangeLog ChangeLog.win32 configure.ac
        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/Certificate.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.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        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/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_im.c
        libpurple/protocols/qq/group_info.h
        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_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/qq/send_file.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc10/wb.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.h
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        libpurple/smiley.c libpurple/win32/global.mak
        pidgin/gtkblist.c pidgin/gtkutils.c
        pidgin/plugins/perl/common/GtkIMHtml.xs po/de.po

ChangeLog: 

merge of '9d9dfe16667a3946233ae2a359de8856ee105289'
     and 'f5de7408fa8d5aed024aaa8c74d7a2d692816b21'