pidgin: f049c504: merge of '8531e88ebf19846bd138013c731b27...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: f049c504b21d56cf277c7dc07990350b99ac1867
Ancestor: 8531e88ebf19846bd138013c731b270540572751
Ancestor: e04ac567cd98f01fdd65d9cd54a09c9c6c17908c
Author: deryni at pidgin.im
Date: 2009-01-07T13:29:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f049c504b21d56cf277c7dc07990350b99ac1867

Modified files:
        ChangeLog ChangeLog.API configure.ac
        libpurple/plugins/perl/common/PluginPref.xs
        libpurple/plugins/perl/common/Util.xs
        libpurple/plugins/perl/perl-handlers.c
        libpurple/protocols/jabber/buddy.c pidgin/plugins/notify.c
        pidgin/win32/nsis/translations/german.nsh po/fi.po

ChangeLog: 

merge of '8531e88ebf19846bd138013c731b270540572751'
     and 'e04ac567cd98f01fdd65d9cd54a09c9c6c17908c'