pidgin.vv: 7bebea53: merge of '932de261b2c091dd834f54518d4c9d...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 7bebea53e8f547e5ef832cc2101be1c0dd2cf24d
Ancestor: 932de261b2c091dd834f54518d4c9df53b9ad7ac
Ancestor: ef1c8c06e832e807799e7e2785305b34f7a257b2
Author: maiku at soc.pidgin.im
Date: 2009-03-19T10:46:41
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/7bebea53e8f547e5ef832cc2101be1c0dd2cf24d

Modified files:
        libpurple/media.c
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/jabber/jingle/iceudp.c
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rawudp.c
        libpurple/protocols/jabber/jingle/rawudp.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/rtp.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/transport.c

ChangeLog: 

merge of '932de261b2c091dd834f54518d4c9df53b9ad7ac'
     and 'ef1c8c06e832e807799e7e2785305b34f7a257b2'