pidgin: adc2c416: merge of '52c0efb045580dac7b6f5e40c91002...

Wed Apr 30 23:17:32 EDT 2008

-----------------------------------------------------------------
Revision: adc2c416311e49c2c9279f1452fea30a94be7bfb
Ancestor: 52c0efb045580dac7b6f5e40c91002e917e0cae3
Ancestor: c0a4f0ab190b75af3dd06de77efc3ac462a4d6c7
Author: deryni at pidgin.im
Date: 2008-04-29T03:31:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/adc2c416311e49c2c9279f1452fea30a94be7bfb

Modified files:
        ChangeLog ChangeLog.API configure.ac
        doc/conversation-signals.dox libpurple/conversation.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/presence.c libpurple/server.c
        libpurple/server.h pidgin/plugins/notify.c

ChangeLog: 

merge of '52c0efb045580dac7b6f5e40c91002e917e0cae3'
     and 'c0a4f0ab190b75af3dd06de77efc3ac462a4d6c7'