cpw.darkrain42.2.6.1: a471e079: merge of '53b02d9c3c8aa71b13cea90eea22a0...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: a471e07974d88252de5a74bbd65b07a8bc4345c7
Ancestor: 53b02d9c3c8aa71b13cea90eea22a0b60155dc8c
Ancestor: a5f1e28f71900287ab051ba7d2ac8a6247311d13
Author: qulogic at pidgin.im
Date: 2009-08-19T01:03:34
Branch: im.pidgin.cpw.darkrain42.2.6.1
URL: http://d.pidgin.im/viewmtn/revision/info/a471e07974d88252de5a74bbd65b07a8bc4345c7

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 INSTALL NEWS
        configure.ac doc/core-signals.dox
        doc/funniest_home_convos.txt doc/jabber-signals.dox
        finch/gntaccount.c finch/gntmedia.c finch/libgnt/gntkeys.c
        libpurple/ft.c libpurple/ft.h libpurple/idle.h
        libpurple/log.c libpurple/marshallers.list libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/plugins/perl/common/XMLNode.xs libpurple/pounce.c
        libpurple/prefs.c libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/sync.h
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/snactypes.h
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/util.c libpurple/proxy.c
        libpurple/purple-send libpurple/purple-send-async
        libpurple/purple.h.in libpurple/savedstatuses.c
        libpurple/server.c libpurple/status.c libpurple/status.h
        libpurple/tests/test_yahoo_util.c libpurple/util.c
        pidgin/gtkblist.c pidgin/gtkcertmgr.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkmedia.c
        pidgin/gtkutils.c pidgin/gtkwhiteboard.c
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/plugins/disco/Makefile.am
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/translations/italian.nsh pidgin.spec.in
        po/ChangeLog po/de.po po/eo.po po/he.po po/hu.po po/it.po
        po/nn.po po/ro.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

merge of '53b02d9c3c8aa71b13cea90eea22a0b60155dc8c'
     and 'a5f1e28f71900287ab051ba7d2ac8a6247311d13'