soc.2008.vv: 918fc800: merge of '3969ff3f40069748728f9ee2376a4b...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 918fc8001ddbd9310a439b02fce437ba82d058ac
Ancestor: 3969ff3f40069748728f9ee2376a4bab3f089d04
Ancestor: f284e82ae268ed7050aba789e9bbb15885d4fb6a
Author: maiku at soc.pidgin.im
Date: 2008-06-06T08:26:57
Branch: im.pidgin.soc.2008.vv
URL: http://d.pidgin.im/viewmtn/revision/info/918fc8001ddbd9310a439b02fce437ba82d058ac

Modified files:
        finch/gntmedia.c finch/gntmedia.h libpurple/marshallers.list
        libpurple/media.c libpurple/media.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle.c
        libpurple/protocols/jabber/jingle.h pidgin/gtkconv.c
        pidgin/gtkmedia.c pidgin/gtkmedia.h pidgin/gtkprefs.c

ChangeLog: 

merge of '3969ff3f40069748728f9ee2376a4bab3f089d04'
     and 'f284e82ae268ed7050aba789e9bbb15885d4fb6a'