pidgin: 0b8a411d: merge of '05176515f0fedf038217d2e11e4e3a...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 0b8a411d28b82cdd7825e4ba13a26bad2c44a449
Ancestor: 05176515f0fedf038217d2e11e4e3a1c92cad166
Ancestor: 34ae591131a579911cfae8a20bcf7231fd20aff2
Author: darkrain42 at pidgin.im
Date: 2009-12-08T07:43:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0b8a411d28b82cdd7825e4ba13a26bad2c44a449

Added files:
        pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
Modified files:
        ChangeLog ChangeLog.win32 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/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/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/libxmpp.c
        libpurple/protocols/jabber/namespaces.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.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
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/ru.po

ChangeLog: 

merge of '05176515f0fedf038217d2e11e4e3a1c92cad166'
     and '34ae591131a579911cfae8a20bcf7231fd20aff2'