pidgin: f25f4d84: merge of 'b3b5983d1eb17af3007d26447c9215

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: f25f4d846c906ec908881571d5279d50893652f0
Ancestor: b3b5983d1eb17af3007d26447c9215e9e8203189
Ancestor: b96969495e3d246fafa8dc2df46eaa91d491d0a2
Author: sadrul at pidgin.im
Date: 2008-03-02T16:44:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f25f4d846c906ec908881571d5279d50893652f0

Added files:
        po/si.po
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        Makefile.am NEWS configure.ac doc/funniest_home_convos.txt
        doc/ui-ops.dox finch/gntblist.c finch/gntlog.c
        finch/libgnt/gntwm.c libpurple/account.c libpurple/blist.c
        libpurple/conversation.c libpurple/eventloop.h
        libpurple/plugin.c libpurple/protocols/irc/cmds.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msnp9/msn-utils.c
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/message.h
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/silc/util.c
        libpurple/protocols/silc10/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/server.c
        libpurple/server.h libpurple/tests/Makefile.am
        libpurple/util.c libpurple/util.h libpurple/win32/global.mak
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkimhtml.c
        pidgin/gtkmain.c pidgin/gtkplugin.c pidgin/minidialog.c
        pidgin/pixmaps/logo.png pidgin.spec.in po/ChangeLog po/ar.po
        po/be at latin.po po/de.po po/el.po po/es.po po/fi.po po/fr.po
        po/he.po po/nb.po po/nl.po po/nn.po po/pl.po po/sk.po
        po/sl.po po/sv.po po/vi.po

ChangeLog: 

merge of 'b3b5983d1eb17af3007d26447c9215e9e8203189'
     and 'b96969495e3d246fafa8dc2df46eaa91d491d0a2'