pidgin: ac9ab8a7: merge of '5f8528ffc18355719bd406e1c579e0...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: ac9ab8a79b7f7930a0a42efaccce7a968f357578
Ancestor: 5f8528ffc18355719bd406e1c579e0e369fb2585
Ancestor: 7811d6e917a33b224cad7842445e932470fcc55e
Author: nosnilmot at pidgin.im
Date: 2009-01-08T14:16:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ac9ab8a79b7f7930a0a42efaccce7a968f357578

Modified files:
        ChangeLog ChangeLog.API configure.ac finch/libgnt/gntkeys.c
        libpurple/dbus-server.c
        libpurple/plugins/perl/common/PluginPref.xs
        libpurple/plugins/perl/common/Util.xs
        libpurple/plugins/perl/perl-handlers.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/sametime/Makefile.am
        libpurple/protocols/sametime/Makefile.mingw
        pidgin/gtkaccount.c pidgin/gtkpounce.c pidgin/gtksmiley.c
        pidgin/plugins/notify.c
        pidgin/win32/nsis/translations/german.nsh po/fi.po

ChangeLog: 

merge of '5f8528ffc18355719bd406e1c579e0e369fb2585'
     and '7811d6e917a33b224cad7842445e932470fcc55e'