pidgin: 7b2b0392: merge of 'b5086a027dfbc0926b74627b978379...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 7b2b0392fe4ca968ebc6a2e623521ca4d8014024
Ancestor: b5086a027dfbc0926b74627b9783794d250c2cb4
Ancestor: ea400018f9483ac602c6fa1e16d8c94e37a655b2
Author: qulogic at pidgin.im
Date: 2010-05-14T06:57:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7b2b0392fe4ca968ebc6a2e623521ca4d8014024

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

merge of 'b5086a027dfbc0926b74627b9783794d250c2cb4'
     and 'ea400018f9483ac602c6fa1e16d8c94e37a655b2'