pidgin: cd770a44: merge of '4f95778269e5a6f5dc65dc999e28f6...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: cd770a44f05f96d1e74ea761e614d1a468ba60df
Ancestor: 4f95778269e5a6f5dc65dc999e28f67e5604b35a
Ancestor: fb76a1cdbe11d4297b67af0a12356362323f60c5
Author: qulogic at pidgin.im
Date: 2010-05-21T21:57:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cd770a44f05f96d1e74ea761e614d1a468ba60df

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/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 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
Modified attrs:
        pidgin/pixmaps/emotes/default/24/chilli.png
        pidgin/pixmaps/emotes/default/24/mrgreen.png
        pidgin/win32/nsis/rpm2zip.sh

ChangeLog: 

merge of '4f95778269e5a6f5dc65dc999e28f67e5604b35a'
     and 'fb76a1cdbe11d4297b67af0a12356362323f60c5'