pidgin: ac63d56c: merge of '08062d1b1267b18fa3d47ea8eded7e...

Tue Apr 29 01:41:04 EDT 2008

-----------------------------------------------------------------
Revision: ac63d56cfc31a42a2f8da09d7f04ae9e0187e823
Ancestor: 08062d1b1267b18fa3d47ea8eded7e2b826b7e8c
Ancestor: 0ed9d51dcce10da3af15dd44273af472eea6cb0c
Author: markdoliner at pidgin.im
Date: 2008-04-29T05:39:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ac63d56cfc31a42a2f8da09d7f04ae9e0187e823

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

ChangeLog: 

merge of '08062d1b1267b18fa3d47ea8eded7e2b826b7e8c'
     and '0ed9d51dcce10da3af15dd44273af472eea6cb0c'