pidgin.vv: 9fc1a9e6: merge of '106c6ba87b3a431f8ec3adad7e4e56...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 9fc1a9e643b3113695eaf212da6cb69b061ef832
Ancestor: 106c6ba87b3a431f8ec3adad7e4e569f3d008f83
Ancestor: a00c26c622d19ab8c25e652b478707ea3368a619
Author: maiku at soc.pidgin.im
Date: 2009-01-10T00:55:35
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/9fc1a9e643b3113695eaf212da6cb69b061ef832

Modified files:
        libpurple/media.c libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/google.c
        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
        pidgin/gtkprefs.c

ChangeLog: 

merge of '106c6ba87b3a431f8ec3adad7e4e569f3d008f83'
     and 'a00c26c622d19ab8c25e652b478707ea3368a619'