pidgin, im.pidgin.pidgin.next.minor: 0ed9d51d: merge of '6bf9ac8e017081c907061167edd28a...

Tue Apr 29 00:07:19 EDT 2008

-----------------------------------------------------------------
Revision: 0ed9d51dcce10da3af15dd44273af472eea6cb0c
Ancestor: 6bf9ac8e017081c907061167edd28a1adcbec3c9
Ancestor: 91a643a04016322c0da1e540889a828686bb5d8d
Author: evands at pidgin.im
Date: 2008-04-29T03:57:06
Branch: im.pidgin.pidgin
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/0ed9d51dcce10da3af15dd44273af472eea6cb0c

Modified files:
        ChangeLog.API doc/conversation-signals.dox doc/finch.1.in
        finch/libgnt/gntws.c libpurple/conversation.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/presence.c libpurple/prpl.h
        libpurple/server.c libpurple/server.h

ChangeLog: 

merge of '6bf9ac8e017081c907061167edd28a1adcbec3c9'
     and '91a643a04016322c0da1e540889a828686bb5d8d'