soc.2010.icq-tlc: 4b6b4c60: propagate from branch 'im.pidgin.pidgin'...

[ivan.komarov at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 4b6b4c6044607c2117d736601fd7f6e25e11ce67
Ancestor: 12dd3c1a3cb110106f7ef72077145596ea358642
Ancestor: 637cbec3044756a8ef4273f687d84b18f10b05c4
Author: ivan.komarov at soc.pidgin.im
Date: 2010-05-23T17:22:51
Branch: im.pidgin.soc.2010.icq-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/4b6b4c6044607c2117d736601fd7f6e25e11ce67

Added files:
        pidgin/pixmaps/emotes/default/24/chilli.png
        pidgin/pixmaps/emotes/default/24/mrgreen.png
        pidgin/win32/nsis/rpm2zip.sh
Modified files:
        COPYRIGHT ChangeLog libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/auth_scram.c
        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/msn.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/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/profile.c
        libpurple/protocols/mxit/profile.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/protocol.h
        libpurple/protocols/mxit/roster.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/qq_base.c pidgin/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/win32/nsis/generate_gtk_zip.sh
        pidgin/win32/nsis/nsis_translations.desktop.in po/ChangeLog
        po/fr.po po/he.po
Modified attrs:
        pidgin/pixmaps/emotes/default/24/chilli.png
        pidgin/pixmaps/emotes/default/24/mrgreen.png
        pidgin/win32/nsis/rpm2zip.sh

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 637cbec3044756a8ef4273f687d84b18f10b05c4)
            to branch 'im.pidgin.soc.2010.icq-tlc' (head 12dd3c1a3cb110106f7ef72077145596ea358642)