pidgin.vv: 1469f598: merge of '1cd039d2f04c877820b4097e462f26...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 1469f598d3d2613468952250ff40e016e9d44682
Ancestor: 1cd039d2f04c877820b4097e462f26831c2d828e
Ancestor: fd3a51d3135cc4ef80591280934a987837bd3a2e
Author: maiku at soc.pidgin.im
Date: 2009-02-05T11:47:40
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/1469f598d3d2613468952250ff40e016e9d44682

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        libpurple/dbus-analyze-functions.py libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h libpurple/network.c
        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/iceudp.c
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msg.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/qq.c libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c libpurple/xmlnode.c
        libpurple/xmlnode.h pidgin/gtkdialogs.c pidgin/gtkmedia.c
        pidgin/plugins/win32/winprefs/winprefs.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '1cd039d2f04c877820b4097e462f26831c2d828e'
     and 'fd3a51d3135cc4ef80591280934a987837bd3a2e'