pidgin: f1a655d2: merge of 'aada73f0d8a35997280d570f47caf3...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: f1a655d2ea516fdbd9959af072854c601e839c1c
Ancestor: aada73f0d8a35997280d570f47caf30907fe68df
Ancestor: f0addfa93983499a661e29f567e66a98a9544a89
Author: qulogic at pidgin.im
Date: 2009-12-09T06:16:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f1a655d2ea516fdbd9959af072854c601e839c1c

Added files:
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/auth_digest_md5.c
        libpurple/protocols/jabber/auth_plain.c
        libpurple/protocols/jabber/auth_scram.c
        libpurple/protocols/jabber/auth_scram.h
        libpurple/tests/test_jabber_scram.c
        pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
Modified files:
        ChangeLog ChangeLog.win32 configure.ac finch/finch.c
        finch/gntaccount.c finch/gntblist.c finch/gntcertmgr.c
        finch/gntconn.c finch/gntconv.c finch/gntdebug.c
        finch/gntft.c finch/gntlog.c finch/gntmedia.c
        finch/gntnotify.c finch/gntplugin.c finch/gntpounce.c
        finch/libgnt/gntkeys.h finch/libgnt/gntutils.c
        finch/libgnt/wms/s.c libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/dcc.c
        libpurple/protocols/gg/lib/events.c
        libpurple/protocols/gg/lib/http.c
        libpurple/protocols/gg/lib/libgadu.c
        libpurple/protocols/gg/lib/pubdir.c
        libpurple/protocols/gg/lib/pubdir50.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/namespaces.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/chunk.c
        libpurple/protocols/mxit/cipher.c
        libpurple/protocols/mxit/filexfer.c
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/http.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/profile.c
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/yahoo/ycht.c libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c libpurple/tests/tests.h
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog
        po/POTFILES.in po/ru.po

ChangeLog: 

merge of 'aada73f0d8a35997280d570f47caf30907fe68df'
     and 'f0addfa93983499a661e29f567e66a98a9544a89'