pidgin.vv: d43b253c: merge of '6f874569bd42744b784b694f8a44c0...

Tue Jan 13 13:52:40 EST 2009

-----------------------------------------------------------------
Revision: d43b253ca7568a3f07aa77bf397fe4351db73a90
Ancestor: 6f874569bd42744b784b694f8a44c06ec7d7f468
Ancestor: befd3ff0e7dd20f612c653ad773327de142fa5e9
Author: malu at pidgin.im
Date: 2009-01-10T01:32:34
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/d43b253ca7568a3f07aa77bf397fe4351db73a90

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

ChangeLog: 

merge of '6f874569bd42744b784b694f8a44c06ec7d7f468'
     and 'befd3ff0e7dd20f612c653ad773327de142fa5e9'