pidgin: ea400018: propagate from branch 'im.pidgin.pidgin....

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: ea400018f9483ac602c6fa1e16d8c94e37a655b2
Ancestor: 54b2ac9fc179bd46065882041bbaa7b4b6bafce6
Ancestor: ad23bba01aa6026230a0aa76ea2e27d0dfb5c106
Author: rekkanoryo at pidgin.im
Date: 2010-05-13T22:51:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ea400018f9483ac602c6fa1e16d8c94e37a655b2

Added files:
        pidgin/pixmaps/emotes/small/16/grumpy.png
        pidgin/pixmaps/emotes/small/16/invincible.png
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac libpurple/gconf/Makefile.am
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/libgadu-internal.h
        libpurple/protocols/gg/lib/libgadu.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/multimx.h
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/protocol.h
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/roster.h
        libpurple/tests/check_libpurple.c pidgin/Makefile.am
        pidgin/pixmaps/emotes/small/16/Makefile.am
        pidgin/pixmaps/emotes/small/16/hot.png
        pidgin/win32/gtkwin32dep.c pidgin.spec.in po/ChangeLog
        po/ca.po po/de.po
Modified attrs:
        pidgin/pixmaps/emotes/small/16/grumpy.png
        pidgin/pixmaps/emotes/small/16/invincible.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin.mxit' (head ad23bba01aa6026230a0aa76ea2e27d0dfb5c106)
            to branch 'im.pidgin.pidgin' (head 54b2ac9fc179bd46065882041bbaa7b4b6bafce6)