pidgin.vv: a4047299: merge of '85389d6ca8dc05827fa7e57e17906b...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: a4047299427f6e08240e4ed64ac33a7f28ec5846
Ancestor: 85389d6ca8dc05827fa7e57e17906b2f73e2c676
Ancestor: d1fcdfed72472e989b6233008b7293bba744532c
Author: maiku at soc.pidgin.im
Date: 2009-03-23T01:43:25
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/a4047299427f6e08240e4ed64ac33a7f28ec5846

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API finch/gntaccount.c
        finch/gntdebug.c finch/gntft.c finch/gntmedia.c
        finch/gntnotify.c finch/gntplugin.c finch/gntpounce.c
        finch/gntrequest.c finch/gntstatus.c finch/gntui.c
        finch/libgnt/wms/s.c libpurple/blist.h
        libpurple/circbuffer.c libpurple/dnssrv.c libpurple/media.c
        libpurple/media.h 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/rtp.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/userlist.c libpurple/util.c
        pidgin/gtkmedia.c pidgin/gtknotify.c pidgin/gtknotify.h
        pidgin/gtkpounce.c pidgin/gtkprefs.c

ChangeLog: 

merge of '85389d6ca8dc05827fa7e57e17906b2f73e2c676'
     and 'd1fcdfed72472e989b6233008b7293bba744532c'