cpw.darkrain42.xmpp.disco: 17367f37: propagate from branch 'im.pidgin.pidgin'...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 17367f37cdcde61c1f7a9bc2df681c177a65ffbb
Ancestor: 1ecd9e6b8e4cd9ddac69d4c40d68d82020932626
Ancestor: 8a2d3d89b9dfc3024c007c23dcc8dc37e2f65eb6
Author: darkrain42 at pidgin.im
Date: 2009-05-26T02:28:34
Branch: im.pidgin.cpw.darkrain42.xmpp.disco
URL: http://d.pidgin.im/viewmtn/revision/info/17367f37cdcde61c1f7a9bc2df681c177a65ffbb

Added files:
        pidgin/plugins/disco/Makefile.am
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/gtkdisco.h
        pidgin/plugins/disco/xmppdisco.c
        pidgin/plugins/disco/xmppdisco.h
Added directories:
        pidgin/plugins/disco
Modified files:
        COPYRIGHT ChangeLog configure.ac finch/plugins/gnttinyurl.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/yahoo/yahoo.h pidgin/gtkimhtml.c
        pidgin/gtkutils.c pidgin/plugins/Makefile.am

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 1ecd9e6b8e4cd9ddac69d4c40d68d82020932626)
            to branch 'im.pidgin.cpw.darkrain42.xmpp.disco' (head 8a2d3d89b9dfc3024c007c23dcc8dc37e2f65eb6)