pidgin: 342f0165: merge of '3161d3b09a1cb0dfe2a905306fbe19...

Wed Mar 19 23:40:49 EDT 2008

-----------------------------------------------------------------
Revision: 342f0165374f908e0642d8d2f9078be0f99550f2
Ancestor: 3161d3b09a1cb0dfe2a905306fbe19a6e76f5531
Ancestor: 936fb35924ee04ab0274875100b8b63d7feca83d
Author: deryni at pidgin.im
Date: 2008-03-20T03:37:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/342f0165374f908e0642d8d2f9078be0f99550f2

Modified files:
        ChangeLog configure.ac libpurple/account.c
        libpurple/plugins/test.pl libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/xdata.c pidgin/gtkblist.c

ChangeLog: 

merge of '3161d3b09a1cb0dfe2a905306fbe19a6e76f5531'
     and '936fb35924ee04ab0274875100b8b63d7feca83d'