pidgin.vv: 235b7c3a: merge of 'bf07e6251df10e4c8c39545c4ff401...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 235b7c3a3672bb79aa7475db32880ccd257380fa
Ancestor: bf07e6251df10e4c8c39545c4ff401db5b447c37
Ancestor: c73207d75d40242b33089c1072b93ff301ab15b6
Author: maiku at soc.pidgin.im
Date: 2009-03-19T09:54:02
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/235b7c3a3672bb79aa7475db32880ccd257380fa

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

ChangeLog: 

merge of 'bf07e6251df10e4c8c39545c4ff401db5b447c37'
     and 'c73207d75d40242b33089c1072b93ff301ab15b6'