pidgin: a89c814a: merge of '5d9456311f879116a0aa9a4e39d926...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: a89c814a0c81eeacde296ce6a2520f1bac083ba4
Ancestor: 5d9456311f879116a0aa9a4e39d9262030f2f79e
Ancestor: e2c65b46e0e67251bcbbcb45a18222aca71132bc
Author: darkrain42 at pidgin.im
Date: 2009-08-22T23:33:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a89c814a0c81eeacde296ce6a2520f1bac083ba4

Modified files:
        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/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.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 pidgin/gtkmedia.h

ChangeLog: 

merge of '5d9456311f879116a0aa9a4e39d9262030f2f79e'
     and 'e2c65b46e0e67251bcbbcb45a18222aca71132bc'