pidgin.vv: 382f9ff3: merge of '1c8357244603e0d86b5df08b5df711...

Tue Jan 13 13:49:50 EST 2009

-----------------------------------------------------------------
Revision: 382f9ff3bf308b5459a4f1e9aeb654ff849e7aa7
Ancestor: 1c8357244603e0d86b5df08b5df711f916c01347
Ancestor: 38031eda38655d87862feafe0580344c910908b1
Author: malu at pidgin.im
Date: 2009-01-13T13:46:06
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/382f9ff3bf308b5459a4f1e9aeb654ff849e7aa7

Modified files:
        finch/gntmedia.c libpurple/media.c libpurple/media.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jingle/rtp.c pidgin/gtkblist.c
        pidgin/gtkconv.c

ChangeLog: 

merge of '1c8357244603e0d86b5df08b5df711f916c01347'
     and '38031eda38655d87862feafe0580344c910908b1'