pidgin.next.minor: 6a973c8f: merge of '6b848e03c7f6c7c392579517011ded...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 6a973c8f7b76929a8de62bbfd78b7aa36551c809
Ancestor: 6b848e03c7f6c7c392579517011deded648dedec
Ancestor: cfe931b57f5bb36f22e6b5b6dee72e5ee4cf2258
Author: sadrul at pidgin.im
Date: 2008-04-30T11:28:19
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/6a973c8f7b76929a8de62bbfd78b7aa36551c809

Modified files:
        ChangeLog doc/conversation-signals.dox finch/gntblist.c
        finch/gntlog.c finch/gntrequest.c libpurple/conversation.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/misc.c libpurple/prpl.h
        libpurple/server.c libpurple/server.h pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkrequest.c

ChangeLog: 

merge of '6b848e03c7f6c7c392579517011deded648dedec'
     and 'cfe931b57f5bb36f22e6b5b6dee72e5ee4cf2258'