xmpp.custom_smiley: 5499bab1: propagate from branch 'im.pidgin.pidgin'...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 5499bab119f9e44a61835cf4f024c1ea6828ff7c
Ancestor: 8b901ad4ba6c969957644156f9786ec84de1897c
Ancestor: b14102a6c681b35084d2c3f7726de34d4f859fe1
Author: malu at pidgin.im
Date: 2008-09-13T16:13:48
Branch: im.pidgin.xmpp.custom_smiley
URL: http://d.pidgin.im/viewmtn/revision/info/5499bab119f9e44a61835cf4f024c1ea6828ff7c

Added files:
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
Modified files:
        AUTHORS doc/pidgin.1.in finch/libgnt/wms/Makefile.am
        libpurple/plugins/autoaccept.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h libpurple/sslconn.h
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkprefs.c
        pidgin/gtksmiley.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head b14102a6c681b35084d2c3f7726de34d4f859fe1)
            to branch 'im.pidgin.xmpp.custom_smiley' (head 8b901ad4ba6c969957644156f9786ec84de1897c)