pidgin: b28057d6: merge of '0a7f4849f49b45459231087fa690ba...

Mon Apr 28 22:05:52 EDT 2008

-----------------------------------------------------------------
Revision: b28057d6ade7c221b0616c3b02e86659e2d8b10b
Ancestor: 0a7f4849f49b45459231087fa690ba9937eae03c
Ancestor: 2f8316df13d1c3e6bf66b91c28abe1504033dae8
Author: evands at pidgin.im
Date: 2008-04-29T02:01:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b28057d6ade7c221b0616c3b02e86659e2d8b10b

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 '0a7f4849f49b45459231087fa690ba9937eae03c'
     and '2f8316df13d1c3e6bf66b91c28abe1504033dae8'