pidgin.mxit: e97249f0: merge of 'b88c4f72aa3d87a41d0ae232164801...

[andrew.victor at mxit.com]

-----------------------------------------------------------------
Revision: e97249f055babca2f0303bed22ec6eccaa671b94
Ancestor: b88c4f72aa3d87a41d0ae232164801f4e1aeca1a
Ancestor: bbcf4976b4db49082dcd52239fe155eb95c4ee1a
Author: andrew.victor at mxit.com
Date: 2010-01-18T20:41:11
Branch: im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/e97249f055babca2f0303bed22ec6eccaa671b94

Added files:
        po/mr.po
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/gntutils.c finch/libgnt/gntwidget.c
        finch/libgnt/gntwindow.c finch/libgnt/wms/irssi.c
        libpurple/account.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/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/qq/Makefile.am
        libpurple/tests/Makefile.am pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtklog.c pidgin/gtkutils.c
        pidgin/win32/nsis/translations/polish.nsh po/ChangeLog
        po/af.po po/cs.po po/de.po po/gu.po po/kn.po po/nn.po
        po/pl.po po/ru.po po/sq.po po/sv.po po/uk.po po/zh_CN.po

ChangeLog: 

merge of 'b88c4f72aa3d87a41d0ae232164801f4e1aeca1a'
     and 'bbcf4976b4db49082dcd52239fe155eb95c4ee1a'