pidgin: 08062d1b: merge of '0e779a37ee17a7bb7ad39bbe2b37ee...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 08062d1b1267b18fa3d47ea8eded7e2b826b7e8c
Ancestor: 0e779a37ee17a7bb7ad39bbe2b37eeca45975655
Ancestor: 52c0efb045580dac7b6f5e40c91002e917e0cae3
Author: markdoliner at pidgin.im
Date: 2008-04-29T03:14:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/08062d1b1267b18fa3d47ea8eded7e2b826b7e8c

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

ChangeLog: 

merge of '0e779a37ee17a7bb7ad39bbe2b37eeca45975655'
     and '52c0efb045580dac7b6f5e40c91002e917e0cae3'