im.pidgin.gobjectification: 6f27404ac320d16e0ad382d508fc1773db1a82aa

[grim at pidgin.im]

-----------------------------------------------------------------
Revision: 6f27404ac320d16e0ad382d508fc1773db1a82aa
Ancestor: 4cb4d9a12002c39b0bffd5126c2f47e109fc01b1
Ancestor: a4b57701ab4bbe7e36989610187d3a74d6597e6e
Author: grim at pidgin.im
Date: 2007-10-28T04:35:05
Branch: im.pidgin.gobjectification

Added files:
        doc/hierarchy.dot libpurple/descipher.c
        libpurple/descipher.h libpurple/marshallers.list
        libpurple/md4cipher.c libpurple/md4cipher.h
        libpurple/md5cipher.c libpurple/md5cipher.h
        libpurple/plugins/debug_example.c
        libpurple/plugins/helloworld.c
        libpurple/plugins/notify_example.c libpurple/sha1cipher.c
        libpurple/sha1cipher.h
        pidgin/win32/nsis/translations/basque.nsh
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        autogen.sh configure.ac finch/finch.c finch/gntconv.c
        finch/libgnt/Makefile.am libpurple/Makefile.am
        libpurple/cipher.c libpurple/cipher.h libpurple/connection.c
        libpurple/connection.h libpurple/core.c libpurple/ntlm.c
        libpurple/plugins/Makefile.am
        libpurple/plugins/signals-test.c
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/qq_proxy.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/simple/simple.h
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_crypt.c libpurple/proxy.c
        libpurple/signals.c libpurple/signals.h
        libpurple/tests/test_cipher.c libpurple/util.c
        pidgin/Makefile.am pidgin/gtkblist.c pidgin/gtkcertmgr.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkutils.c
        pidgin/gtkutils.h pidgin/pixmaps/status/Makefile.am
        pidgin/plugins/crazychat/cc_features.c
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/new_person_dialog.c
        pidgin/plugins/musicmessaging/musicmessaging.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/de.po
        po/fr.po po/pt_BR.po po/zh_TW.po

ChangeLog: 

explicit merge of '4cb4d9a12002c39b0bffd5126c2f47e109fc01b1'
              and 'a4b57701ab4bbe7e36989610187d3a74d6597e6e'