pidgin: f0addfa9: merge of 'f31da20f593d64a906374f7963e178...

Tue Dec 8 12:26:14 EST 2009

-----------------------------------------------------------------
Revision: f0addfa93983499a661e29f567e66a98a9544a89
Ancestor: f31da20f593d64a906374f7963e178dcd1738ac3
Ancestor: f39cd1fed08fe5f5e3165a087fcc36ed984a6eee
Author: darkrain42 at pidgin.im
Date: 2009-12-08T17:24:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f0addfa93983499a661e29f567e66a98a9544a89

Added files:
        pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
Modified files:
        ChangeLog.win32 finch/libgnt/gntkeys.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/oscar/oscar.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog

ChangeLog: 

merge of 'f31da20f593d64a906374f7963e178dcd1738ac3'
     and 'f39cd1fed08fe5f5e3165a087fcc36ed984a6eee'