pidgin.vv: a940363e: merge of '8abcc61528a93f4c18a6e1f200a7ba...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: a940363ef1efa4bf53c71cbb8201f36ed5795583
Ancestor: 8abcc61528a93f4c18a6e1f200a7ba69f1694c28
Ancestor: 96b230451345d5543554f1d018ab450c76820d01
Author: maiku at soc.pidgin.im
Date: 2009-02-05T00:15:33
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/a940363ef1efa4bf53c71cbb8201f36ed5795583

Modified files:
        libpurple/media.c libpurple/mediamanager.c
        libpurple/mediamanager.h libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rtp.c pidgin/gtkmedia.c

ChangeLog: 

merge of '8abcc61528a93f4c18a6e1f200a7ba69f1694c28'
     and '96b230451345d5543554f1d018ab450c76820d01'