pidgin.vv: e00715f9: merge of '1fa05b8b4d069723f0cba486203a2a...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: e00715f97e9c1357a19cfc29c634097b37561020
Ancestor: 1fa05b8b4d069723f0cba486203a2a00c3baf096
Ancestor: 9fc1a9e643b3113695eaf212da6cb69b061ef832
Author: maiku at soc.pidgin.im
Date: 2009-01-10T01:11:29
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/e00715f97e9c1357a19cfc29c634097b37561020

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 '1fa05b8b4d069723f0cba486203a2a00c3baf096'
     and '9fc1a9e643b3113695eaf212da6cb69b061ef832'