pidgin: bcae499a: propagate from branch 'im.pidgin.soc.201...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: bcae499af351044e047d297b8032fa4dca99c147
Ancestor: 64c9fc1442c7815de47d3f6756f59f1d09a1d530
Ancestor: ea400018f9483ac602c6fa1e16d8c94e37a655b2
Author: markdoliner at pidgin.im
Date: 2010-05-14T19:30:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bcae499af351044e047d297b8032fa4dca99c147

Added files:
        pidgin/pixmaps/emotes/small/16/grumpy.png
        pidgin/pixmaps/emotes/small/16/invincible.png po/as.po
        po/ml.po
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac libpurple/ft.c libpurple/gconf/Makefile.am
        libpurple/network.h libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/gg/gg.c
        libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/libgadu-internal.h
        libpurple/protocols/gg/lib/libgadu.h
        libpurple/protocols/gg/search.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/auth_digest_md5.c
        libpurple/protocols/jabber/auth_plain.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.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/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/prpl.h
        libpurple/request.c libpurple/request.h
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_util.c libpurple/util.c
        pidgin/Makefile.am pidgin/gtkdialogs.c pidgin/gtkrequest.c
        pidgin/pixmaps/emotes/small/16/Makefile.am
        pidgin/pixmaps/emotes/small/16/hot.png
        pidgin/win32/gtkwin32dep.c pidgin.spec.in po/ChangeLog
        po/af.po po/bn.po po/ca.po po/ca at valencia.po po/cs.po
        po/de.po po/hu.po po/it.po po/mr.po po/nn.po po/pl.po
        po/ro.po po/sk.po po/sl.po po/sq.po po/uk.po po/zh_HK.po
        po/zh_TW.po
Modified attrs:
        pidgin/pixmaps/emotes/small/16/grumpy.png
        pidgin/pixmaps/emotes/small/16/invincible.png

ChangeLog: 

propagate from branch 'im.pidgin.soc.2010.icq-tlc' (head 64c9fc1442c7815de47d3f6756f59f1d09a1d530)
            to branch 'im.pidgin.pidgin' (head ea400018f9483ac602c6fa1e16d8c94e37a655b2)