pidgin.vv: 36ce4dcc: merge of 'd43b253ca7568a3f07aa77bf397fe4...

Tue Jan 13 13:49:46 EST 2009

-----------------------------------------------------------------
Revision: 36ce4dcc4d637d6227ef52b2e9e72f957f0435ff
Ancestor: d43b253ca7568a3f07aa77bf397fe4351db73a90
Ancestor: dcc53c9783aecbdde6269c4310ec4b0cf511bd9e
Author: malu at pidgin.im
Date: 2009-01-12T19:27:55
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/36ce4dcc4d637d6227ef52b2e9e72f957f0435ff

Modified files:
        libpurple/media.c libpurple/media.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jingle/rtp.c pidgin/gtkmedia.c

ChangeLog: 

merge of 'd43b253ca7568a3f07aa77bf397fe4351db73a90'
     and 'dcc53c9783aecbdde6269c4310ec4b0cf511bd9e'