cpw.malu.xmpp.google_relay: 72d65c94: merge of '0e796ed7d94b3fa776ecd40ce0da65...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 72d65c944b0cad18592ac527559d320f9fd32e58
Ancestor: 0e796ed7d94b3fa776ecd40ce0da65ae3f6b3242
Ancestor: ceed48b0e66b4c3d505f6403da76076d6ee203a5
Author: malu at pidgin.im
Date: 2010-01-08T23:33:51
Branch: im.pidgin.cpw.malu.xmpp.google_relay
URL: http://d.pidgin.im/viewmtn/revision/info/72d65c944b0cad18592ac527559d320f9fd32e58

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac finch/gntidle.c finch/gntrequest.c
        finch/gntstatus.c finch/libgnt/gntinternal.h
        finch/libgnt/gntline.c finch/libgnt/gntmenuitem.c
        finch/libgnt/gntmenuitemcheck.c
        finch/libgnt/gntprogressbar.c finch/libgnt/gntslider.c
        finch/libgnt/gntwidget.c finch/libgnt/gntwindow.c
        finch/libgnt/wms/irssi.c libpurple/account.c
        libpurple/certificate.c libpurple/conversation.h
        libpurple/dbus-server.c libpurple/ft.c libpurple/media.h
        libpurple/plugins/perl/common/Log.xs
        libpurple/plugins/perl/common/Proxy.xs
        libpurple/plugins/signals-test.c
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/oscar/oscar.c
        libpurple/purple-uninstalled.pc.in
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_cipher.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkft.c pidgin/gtkimhtml.c
        pidgin/gtklog.c pidgin/gtkprefs.c
        pidgin/pidgin-uninstalled.pc.in po/ChangeLog po/de.po

ChangeLog: 

merge of '0e796ed7d94b3fa776ecd40ce0da65ae3f6b3242'
     and 'ceed48b0e66b4c3d505f6403da76076d6ee203a5'