pidgin: 33247eb6: propagate from branch 'im.pidgin.cpw.mal...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 33247eb604d4bf72c0c2fdf0f89348db8cc960c6
Ancestor: 024731c3cb9e8c0e0479d91f68aeaf7fae9a978b
Ancestor: 98d8db26c6d12378d0113a97c8b3f989233a5cbc
Author: malu at pidgin.im
Date: 2010-04-28T19:27:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/33247eb604d4bf72c0c2fdf0f89348db8cc960c6

Modified files:
        ChangeLog ChangeLog.API libpurple/ft.c libpurple/ft.h
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/namespaces.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c libpurple/prpl.h
        libpurple/request.c libpurple/request.h pidgin/gtkft.c
        pidgin/gtkrequest.c po/ca.po

ChangeLog: 

propagate from branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 98d8db26c6d12378d0113a97c8b3f989233a5cbc)
            to branch 'im.pidgin.pidgin' (head 024731c3cb9e8c0e0479d91f68aeaf7fae9a978b)