im.pidgin.pidgin.next.minor: 1bcf84e26d11f259b3c5ec663e3fecc2f01aed33

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 1bcf84e26d11f259b3c5ec663e3fecc2f01aed33
Ancestor: 49d0219884ede2c6c571f2df73e29dffa86f54ad
Ancestor: 8f24e3576448fefbc861e06f1e8d5fe17db2e71a
Author: rlaager at pidgin.im
Date: 2007-10-14T02:13:14
Branch: im.pidgin.pidgin.next.minor

Modified files:
        finch/gntaccount.c finch/gntblist.c finch/gntcertmgr.c
        finch/gntconn.c finch/gntplugin.c finch/gntpounce.c
        finch/gntprefs.c finch/gntrequest.c finch/gntstatus.c
        libpurple/account.c libpurple/certificate.c
        libpurple/conversation.c libpurple/ft.c
        libpurple/plugins/autoaccept.c libpurple/plugins/buddynote.c
        libpurple/plugins/idle.c libpurple/plugins/offlinemsg.c
        libpurple/plugins/perl/common/Request.xs
        libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/dialog.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/ops.c libpurple/protocols/silc/pk.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc/util.c
        libpurple/protocols/silc/wb.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/silc10/ops.c
        libpurple/protocols/silc10/pk.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/silc10/util.c
        libpurple/protocols/silc10/wb.c
        libpurple/protocols/toc/toc.c
        libpurple/protocols/yahoo/yahoo.c libpurple/request.c
        libpurple/request.h libpurple/server.c pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkcertmgr.c pidgin/gtkconv.c
        pidgin/gtkdebug.c pidgin/gtkdialogs.c pidgin/gtkdialogs.h
        pidgin/gtkimhtmltoolbar.c pidgin/gtklog.c pidgin/gtklog.h
        pidgin/gtkplugin.c pidgin/gtkplugin.h pidgin/gtkpounce.c
        pidgin/gtkpounce.h pidgin/gtkprefs.c pidgin/gtkprivacy.c
        pidgin/gtkrequest.c pidgin/gtksavedstatuses.c
        pidgin/gtkstatusbox.c pidgin/gtkutils.c
        pidgin/plugins/perl/common/GtkDialogs.xs
        pidgin/plugins/perl/common/GtkLog.xs
        pidgin/plugins/perl/common/GtkPlugin.xs
        pidgin/plugins/perl/common/GtkPounce.xs

ChangeLog: 

explicit merge of '8f24e3576448fefbc861e06f1e8d5fe17db2e71a'
              and '49d0219884ede2c6c571f2df73e29dffa86f54ad'