pidgin: d99389c7: merge of '051b51aa2424e978f16c10511f7a4e...

Fri Jun 5 00:31:13 EDT 2009

-----------------------------------------------------------------
Revision: d99389c7a3c660aa7a54362dd26e7b3e103a05c8
Ancestor: 051b51aa2424e978f16c10511f7a4e0f45c7c5d3
Ancestor: 69b3b10f3cd5853b74cace5f7247f384555cbbff
Author: qulogic at pidgin.im
Date: 2009-06-05T04:27:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d99389c7a3c660aa7a54362dd26e7b3e103a05c8

Modified files:
        ChangeLog ChangeLog.API libpurple/conversation.c
        libpurple/plugins/psychic.c libpurple/proxy.c
        libpurple/proxy.h libpurple/server.c pidgin/gtkblist.c
        pidgin/plugins/disco/xmppdisco.c

ChangeLog: 

merge of '051b51aa2424e978f16c10511f7a4e0f45c7c5d3'
     and '69b3b10f3cd5853b74cace5f7247f384555cbbff'