soc.2008.vv: 99d72a9b: merge of '0685fc29468269a2af68268baa627b...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 99d72a9b9b6887865627081565f052f29516d19b
Ancestor: 0685fc29468269a2af68268baa627b09f83339e4
Ancestor: 8222acabc1382453e8dda5b8d507e4df0f0a91ff
Author: maiku at soc.pidgin.im
Date: 2008-05-27T04:55:10
Branch: im.pidgin.soc.2008.vv
URL: http://d.pidgin.im/viewmtn/revision/info/99d72a9b9b6887865627081565f052f29516d19b

Modified files:
        configure.ac finch/gntmedia.c finch/gntui.c
        libpurple/Makefile.am libpurple/media.c libpurple/media.h
        libpurple/mediamanager.c libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle.c
        libpurple/protocols/jabber/jingle.h
        libpurple/protocols/jabber/libxmpp.c libpurple/server.c
        pidgin/gtkconv.c pidgin/gtkmedia.c pidgin/gtkprefs.c

ChangeLog: 

merge of '0685fc29468269a2af68268baa627b09f83339e4'
     and '8222acabc1382453e8dda5b8d507e4df0f0a91ff'