pidgin: 09e2db58: merge of '375487659d7425062cb32079e5be08...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 09e2db5855f4bc91386c258dfe0a54c663db3602
Ancestor: 375487659d7425062cb32079e5be08ac45951bd8
Ancestor: 458e696572314f8fd2d259d40713ad955dd82581
Author: qulogic at pidgin.im
Date: 2009-08-23T03:32:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/09e2db5855f4bc91386c258dfe0a54c663db3602

Modified files:
        ChangeLog PLUGIN_HOWTO finch/plugins/grouping.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/msn/cmdproc.h
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/oim.h libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/qq_crypt.h libpurple/smiley.c
        libpurple/smiley.h pidgin/gtkmedia.h pidgin/gtknotify.c

ChangeLog: 

merge of '375487659d7425062cb32079e5be08ac45951bd8'
     and '458e696572314f8fd2d259d40713ad955dd82581'