cpw.darkrain42.xmpp.disco: d75cba73: merge of '17367f37cdcde61c1f7a9bc2df681c...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: d75cba73217aa91d4e2547cd9084ca64c3610eaf
Ancestor: 17367f37cdcde61c1f7a9bc2df681c177a65ffbb
Ancestor: ded483522069298e5562139fb48032231da598dc
Author: darkrain42 at pidgin.im
Date: 2009-05-26T02:46:24
Branch: im.pidgin.cpw.darkrain42.xmpp.disco
URL: http://d.pidgin.im/viewmtn/revision/info/d75cba73217aa91d4e2547cd9084ca64c3610eaf

Modified files:
        COPYRIGHT ChangeLog finch/plugins/gnttinyurl.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/yahoo/yahoo.h pidgin/gtkimhtml.c
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/xmppdisco.c

ChangeLog: 

merge of '17367f37cdcde61c1f7a9bc2df681c177a65ffbb'
     and 'ded483522069298e5562139fb48032231da598dc'