pidgin.mxit: 695a97f9: merge of 'c32c1fdff08db87b69fc0eb921a5ea...

[andrew.victor at mxit.com]

-----------------------------------------------------------------
Revision: 695a97f9710d782a912735770e97840290fff5d9
Ancestor: c32c1fdff08db87b69fc0eb921a5eaafcb5ef67e
Ancestor: fcd99a6bb8c6362d64f295a1b95a5b1130460b85
Author: andrew.victor at mxit.com
Date: 2010-05-28T21:10:09
Branch: im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/695a97f9710d782a912735770e97840290fff5d9

Added files:
        pidgin/pixmaps/tray/hicolor/index.theme
Modified files:
        COPYRIGHT ChangeLog ChangeLog.win32 Makefile.am
        libpurple/media/backend-fs2.h
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/directconn.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/mxit/http.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/qq/qq_base.c pidgin/gtkdocklet-gtk.c
        pidgin/pixmaps/Makefile.am
        pidgin/win32/nsis/generate_gtk_zip.sh
        pidgin/win32/nsis/nsis_translations.desktop.in po/ca.po
        po/de.po po/fr.po

ChangeLog: 

merge of 'c32c1fdff08db87b69fc0eb921a5eaafcb5ef67e'
     and 'fcd99a6bb8c6362d64f295a1b95a5b1130460b85'