pidgin: 1a8a740d: merge of '21d37789f674809d615fc7676a092f...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 1a8a740d833ae8da0fbc2f6c9a917909ca57eb8b
Ancestor: 21d37789f674809d615fc7676a092f1da438b0f5
Ancestor: aafbbc317ab5f69e31e0bb6cabc264bb70745ef2
Author: evands at pidgin.im
Date: 2008-05-02T22:51:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1a8a740d833ae8da0fbc2f6c9a917909ca57eb8b

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API
        doc/conversation-signals.dox finch/gntaccount.c
        finch/gntblist.c finch/gntlog.c finch/gntrequest.c
        finch/gntsound.c finch/libgnt/gntwidget.c
        finch/libgnt/gntwm.c libpurple/conversation.c
        libpurple/idle.c libpurple/plugins/newline.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/novell/nmuser.c
        libpurple/protocols/oscar/misc.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/toc/toc.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/server.c libpurple/server.h pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkprefs.c pidgin/gtkrequest.c
        pidgin/gtksavedstatuses.c pidgin/gtksound.c
        pidgin/plugins/gevolution/new_person_dialog.c
        pidgin/plugins/notify.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '21d37789f674809d615fc7676a092f1da438b0f5'
     and 'aafbbc317ab5f69e31e0bb6cabc264bb70745ef2'