pidgin: 97f83f33: merge of '05c26e9f58c2ab03f9f6d60143405f...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 97f83f332bb9a750fda7ee2ac6de2a618c312f40
Ancestor: 05c26e9f58c2ab03f9f6d60143405f368789957d
Ancestor: d23d06190a3e58a0c78a5071310cd724ac228634
Author: rlaager at pidgin.im
Date: 2008-10-09T11:58:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/97f83f332bb9a750fda7ee2ac6de2a618c312f40

Modified files:
        ChangeLog libpurple/conversation.h libpurple/core.c
        libpurple/dnsquery.c
        libpurple/protocols/bonjour/mdns_common.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/group.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msg.h
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/oscar/oscar.c pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkconn.c pidgin/gtkimhtml.c
        pidgin/gtkstatusbox.c pidgin/gtkstatusbox.h
        pidgin/plugins/notify.c
        pidgin/win32/nsis/translations/finnish.nsh
        pidgin/win32/winpidgin.c po/POTFILES.in po/de.po po/fi.po
        po/hu.po po/lt.po po/sv.po

ChangeLog: 

merge of '05c26e9f58c2ab03f9f6d60143405f368789957d'
     and 'd23d06190a3e58a0c78a5071310cd724ac228634'