pidgin: b9cd46af: merge of '7f78e4be502956bb580a87289cf2ac...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: b9cd46afda98aa27442ff47b37acb217686cecec
Ancestor: 7f78e4be502956bb580a87289cf2acfe6254ea62
Ancestor: adc2c416311e49c2c9279f1452fea30a94be7bfb
Author: deryni at pidgin.im
Date: 2008-05-01T03:06:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b9cd46afda98aa27442ff47b37acb217686cecec

Modified files:
        ChangeLog ChangeLog.API configure.ac
        doc/conversation-signals.dox finch/gntaccount.c
        finch/gntblist.c finch/gntlog.c finch/gntrequest.c
        finch/gntsound.c libpurple/conversation.c
        libpurple/plugins/newline.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/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/server.c
        libpurple/server.h pidgin/gtkaccount.c pidgin/gtkblist.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

ChangeLog: 

merge of '7f78e4be502956bb580a87289cf2acfe6254ea62'
     and 'adc2c416311e49c2c9279f1452fea30a94be7bfb'