pidgin, im.pidgin.pidgin.mxit: fcd99a6b: propagate from branch 'im.pidgin.pidgin....

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: fcd99a6bb8c6362d64f295a1b95a5b1130460b85
Ancestor: 6c7bc4d299467c6be45dd213e52cffe938c31556
Ancestor: b4547e5df2f928e2dc0e471d88aa7a8975222c0e
Author: rekkanoryo at pidgin.im
Date: 2010-05-26T15:54:41
Branch: im.pidgin.pidgin
Branch: im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/fcd99a6bb8c6362d64f295a1b95a5b1130460b85

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/login.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: 

propagate from branch 'im.pidgin.pidgin.mxit' (head b4547e5df2f928e2dc0e471d88aa7a8975222c0e)
            to branch 'im.pidgin.pidgin' (head 6c7bc4d299467c6be45dd213e52cffe938c31556)


Merge of simple bugfixes from the MXit guys.