pidgin: da4fface: merge of 'a2f94e06ea53c95077731e08336992...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: da4fface7b23fb7415d6ce2a72770ce5fbe006a0
Ancestor: a2f94e06ea53c95077731e0833699222e6050fd0
Ancestor: b20c44775e2aa1c5bc5e36f7f94adafc5c67b3fd
Author: qulogic at pidgin.im
Date: 2009-01-25T20:51:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/da4fface7b23fb7415d6ce2a72770ce5fbe006a0

Modified files:
        AUTHORS COPYRIGHT ChangeLog.API doc/finch.1.in
        doc/pidgin.1.in libpurple/account.c libpurple/connection.c
        libpurple/core.c libpurple/prefs.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/msn/slpcall.c libpurple/status.c
        libpurple/status.h pidgin/gtkaccount.c pidgin/gtkblist.c
        pidgin/gtkgaim-compat.h pidgin/gtkmain.c
        pidgin/gtkpluginpref.c pidgin/gtkprefs.c pidgin/gtkrequest.c
        pidgin/pidgin.h po/fi.po po/l10n.xsl

ChangeLog: 

merge of 'a2f94e06ea53c95077731e0833699222e6050fd0'
     and 'b20c44775e2aa1c5bc5e36f7f94adafc5c67b3fd'