pidgin: 04ad40a1: merge of '5e1784d5a975dc0726e72521fbf602...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 04ad40a15b435d486d5221c00c7ed1e80d7ff8de
Ancestor: 5e1784d5a975dc0726e72521fbf6024dfa281d84
Ancestor: e28bbfa3c8184843c6f30c7fe26da08ade3873c2
Author: darkrain42 at pidgin.im
Date: 2009-11-27T07:13:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/04ad40a15b435d486d5221c00c7ed1e80d7ff8de

Added files:
        libpurple/protocols/jabber/namespaces.h
Modified files:
        doc/finch.1.in libpurple/certificate.c libpurple/cmds.c
        libpurple/dbus-server.c libpurple/debug.c
        libpurple/desktopitem.c libpurple/eventloop.c
        libpurple/imgstore.c libpurple/media.c libpurple/mime.c
        libpurple/nat-pmp.c libpurple/ntlm.c
        libpurple/plugins/log_reader.c
        libpurple/plugins/signals-test.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/useravatar.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/object.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/novell/nmuser.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/qq.h libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/ft.c libpurple/protocols/silc/ops.c
        libpurple/protocols/silc/pk.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc/util.c
        libpurple/protocols/silc/wb.c
        libpurple/protocols/yahoo/util.c libpurple/roomlist.c
        libpurple/tests/test_yahoo_util.c libpurple/theme-manager.c
        libpurple/theme.c libpurple/whiteboard.c libpurple/xmlnode.c
        pidgin/gtkcertmgr.c pidgin/gtkmedia.c pidgin/gtkwhiteboard.c
        pidgin/plugins/gtk-signals-test.c po/de.po po/hu.po

ChangeLog: 

merge of '5e1784d5a975dc0726e72521fbf6024dfa281d84'
     and 'e28bbfa3c8184843c6f30c7fe26da08ade3873c2'