im.pidgin.pidgin: 1991213a0cb9c2d4b066d5acb8e5b5fb77b1470b

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 1991213a0cb9c2d4b066d5acb8e5b5fb77b1470b
Ancestor: 2654fa4bf505fd6b8e400e329323a4b8fb67126f
Ancestor: f46a2c20964123688f14b0584cfb4155bd45892b
Author: sadrul at pidgin.im
Date: 2008-01-10T02:28:48
Branch: im.pidgin.pidgin

Modified files:
        finch/gntft.c finch/gntroomlist.c libpurple/account.c
        libpurple/buddyicon.c libpurple/conversation.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_types.h
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/irc/cmds.c
        libpurple/protocols/yahoo/yahoo.c pidgin/gtkaccount.c
        pidgin/plugins/convcolors.c
        pidgin/win32/nsis/pidgin-installer.nsi po/nb.po

ChangeLog: 

merge of '2654fa4bf505fd6b8e400e329323a4b8fb67126f'
     and 'f46a2c20964123688f14b0584cfb4155bd45892b'