pidgin: b8c29e0d: merge of '67228440771b545dc01526f74fd717...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: b8c29e0dfc3c9081c1be0dd63967aa5224bb3cfa
Ancestor: 67228440771b545dc01526f74fd7171a02fb5e08
Ancestor: 7d328b30bc18c77fc3de6e2870b9b576fac4ab1c
Author: deryni at pidgin.im
Date: 2009-06-09T23:30:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b8c29e0dfc3c9081c1be0dd63967aa5224bb3cfa

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 po/hy.po po/sw.po
        share/ca-certs/StartCom_Certification_Authority.pem
Added directories:
        pidgin/plugins/disco
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API NEWS configure.ac
        doc/notify-signals.dox finch/finch.c finch/gntblist.c
        finch/gntnotify.c finch/plugins/gnttinyurl.c
        libpurple/account.c libpurple/blist.c libpurple/buddyicon.h
        libpurple/conversation.c libpurple/core.h
        libpurple/dnsquery.c libpurple/dnssrv.c libpurple/media.c
        libpurple/nat-pmp.c
        libpurple/plugins/perl/common/Certificate.xs
        libpurple/plugins/perl/common/Cipher.xs
        libpurple/plugins/perl/common/Util.xs
        libpurple/plugins/psychic.c libpurple/plugins/signals-test.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/gg/buddylist.c
        libpurple/protocols/gg/buddylist.h
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/cmds.c
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/parser.h
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/ops.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/proxy.h libpurple/server.c libpurple/signals.c
        libpurple/signals.h libpurple/theme.c libpurple/util.c
        libpurple/util.h pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkmain.c
        pidgin/gtknotify.c pidgin/gtkprefs.c pidgin/gtksmiley.c
        pidgin/gtksmiley.h pidgin/gtkutils.c pidgin/pidginstock.c
        pidgin/plugins/Makefile.am pidgin/plugins/convcolors.c
        pidgin/plugins/pidginrc.c pidgin/plugins/themeedit-icon.h
        pidgin/plugins/xmppconsole.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/ca.po
        po/de.po po/lo.po po/sl.po share/ca-certs/Makefile.am

ChangeLog: 

merge of '67228440771b545dc01526f74fd7171a02fb5e08'
     and '7d328b30bc18c77fc3de6e2870b9b576fac4ab1c'