pidgin.next.minor: 86658ba4: merge of '0ed9d51dcce10da3af15dd44273af4...

Tue Apr 29 00:07:27 EDT 2008

-----------------------------------------------------------------
Revision: 86658ba4e6c0791a427102c9612b41a665bd2a06
Ancestor: 0ed9d51dcce10da3af15dd44273af472eea6cb0c
Ancestor: dd8cccbbce697e7fc1acc0a050c414d7d4f4fac6
Author: evands at pidgin.im
Date: 2008-04-29T03:59:45
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/86658ba4e6c0791a427102c9612b41a665bd2a06

Modified files:
        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

ChangeLog: 

merge of '0ed9d51dcce10da3af15dd44273af472eea6cb0c'
     and 'dd8cccbbce697e7fc1acc0a050c414d7d4f4fac6'