cpw.malu.xmpp.google_relay: c60e85b2: merge of '4e5f78559deacc45eb458cdbe7ffc9...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: c60e85b2ab0b13ecca98ff251d5c5fef3604c70c
Ancestor: 4e5f78559deacc45eb458cdbe7ffc96491ab11bd
Ancestor: 97f70a97fe41a0319d0041706ffaf3a6e4f0367d
Author: malu at pidgin.im
Date: 2010-02-14T22:42:20
Branch: im.pidgin.cpw.malu.xmpp.google_relay
URL: http://d.pidgin.im/viewmtn/revision/info/c60e85b2ab0b13ecca98ff251d5c5fef3604c70c

Added files:
        po/mr.po po/or.po
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        doc/finch.1.in finch/libgnt/gnttree.c
        finch/libgnt/gntutils.c finch/libgnt/gntwm.c
        finch/libgnt/wms/irssi.c libpurple/buddyicon.c
        libpurple/dnssrv.c libpurple/ft.c libpurple/media.c
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/perl/perl-common.h
        libpurple/plugins/perl/perl-handlers.c libpurple/prefs.h
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        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/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/cmdproc.h
        libpurple/protocols/msn/command.h
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/dialog.h
        libpurple/protocols/msn/directconn.h
        libpurple/protocols/msn/error.h
        libpurple/protocols/msn/group.h
        libpurple/protocols/msn/history.h
        libpurple/protocols/msn/httpconn.h
        libpurple/protocols/msn/msg.h libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/msnutils.h
        libpurple/protocols/msn/nexus.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/object.h
        libpurple/protocols/msn/oim.h libpurple/protocols/msn/page.h
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/state.h
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/sync.h
        libpurple/protocols/msn/table.h
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/session.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_friend.c libpurple/proxy.c
        libpurple/tests/Makefile.am libpurple/tests/test_util.c
        libpurple/util.c libpurple/util.h
        libpurple/win32/targets.mak libpurple/xmlnode.c
        pidgin/gtkaccount.c pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist-theme.c pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkdebug.c pidgin/gtkdialogs.c pidgin/gtkft.c
        pidgin/gtkimhtml.c pidgin/gtkpounce.c pidgin/gtkprefs.c
        pidgin/gtkrequest.c pidgin/gtksmiley.c pidgin/gtksmiley.h
        pidgin/gtkstatusbox.c pidgin/gtkthemes.c pidgin/gtkutils.c
        pidgin/gtkwhiteboard.c pidgin/plugins/timestamp.c
        pidgin/win32/gtkwin32dep.c
        pidgin/win32/nsis/translations/polish.nsh po/ChangeLog
        po/af.po po/bn.po po/cs.po po/de.po po/es.po po/fr.po
        po/gu.po po/kn.po po/nb.po po/nn.po po/pa.po po/pl.po
        po/ru.po po/sl.po po/sq.po po/sv.po po/ta.po po/uk.po
        po/zh_CN.po

ChangeLog: 

merge of '4e5f78559deacc45eb458cdbe7ffc96491ab11bd'
     and '97f70a97fe41a0319d0041706ffaf3a6e4f0367d'