pidgin: 018b0ca6: merge of '1588a62b7442c86d09ede6244012e7...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 018b0ca6e16e420d953e99d212dbebd5de6f34b6
Ancestor: 1588a62b7442c86d09ede6244012e7c0eed52478
Ancestor: fb96e8d1db91d871d26f751cc200f9d228f0553d
Author: rlaager at pidgin.im
Date: 2008-12-12T17:08:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/018b0ca6e16e420d953e99d212dbebd5de6f34b6

Modified files:
        COPYRIGHT ChangeLog 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.h
        libpurple/protocols/bonjour/buddy.c
        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/myspace/user.c
        libpurple/protocols/myspace/user.h
        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.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/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 po/de.po

ChangeLog: 

merge of '1588a62b7442c86d09ede6244012e7c0eed52478'
     and 'fb96e8d1db91d871d26f751cc200f9d228f0553d'