pidgin.vv: 6f874569: merge of 'a43fe39095ee00967fa35f7fc14ecd...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 6f874569bd42744b784b694f8a44c06ec7d7f468
Ancestor: a43fe39095ee00967fa35f7fc14ecd698c4b3241
Ancestor: be1f71ec3369834e58cb66cfaa0ac17c03fdbe82
Author: malu at pidgin.im
Date: 2009-01-10T01:27:49
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/6f874569bd42744b784b694f8a44c06ec7d7f468

Modified files:
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/jabber/jingle/iceudp.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/rawudp.c
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/transport.c

ChangeLog: 

merge of 'a43fe39095ee00967fa35f7fc14ecd698c4b3241'
     and 'be1f71ec3369834e58cb66cfaa0ac17c03fdbe82'