pidgin: a0674ed0: merge of '82204c4b8e636617e72c31b471d4f8...

Fri Aug 7 04:40:58 EDT 2009

-----------------------------------------------------------------
Revision: a0674ed0c2d29c63fee2f96c7b09c782076cb1a9
Ancestor: 82204c4b8e636617e72c31b471d4f81e85194540
Ancestor: 84289cafb705d202e2c87aa0b5b6a00aa796b7f5
Author: maiku at soc.pidgin.im
Date: 2009-08-07T08:36:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a0674ed0c2d29c63fee2f96c7b09c782076cb1a9

Modified files:
        ChangeLog finch/gntmedia.c libpurple/marshallers.list
        libpurple/media.c libpurple/mediamanager.c
        libpurple/protocols/jabber/chat.c libpurple/purple.h.in
        pidgin/gtkconv.c pidgin/gtkmedia.c

ChangeLog: 

merge of '82204c4b8e636617e72c31b471d4f81e85194540'
     and '84289cafb705d202e2c87aa0b5b6a00aa796b7f5'