pidgin: e04ac567: merge of '91c54e1cd7a33198f97836ac32ab8f...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: e04ac567cd98f01fdd65d9cd54a09c9c6c17908c
Ancestor: 91c54e1cd7a33198f97836ac32ab8f3f3111efe6
Ancestor: b1fa9aff4c34ce047c572504619d09fd47c9d6be
Author: deryni at pidgin.im
Date: 2009-01-07T04:43:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e04ac567cd98f01fdd65d9cd54a09c9c6c17908c

Modified files:
        ChangeLog ChangeLog.API configure.ac 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/sametime/Makefile.am
        pidgin/plugins/notify.c

ChangeLog: 

merge of '91c54e1cd7a33198f97836ac32ab8f3f3111efe6'
     and 'b1fa9aff4c34ce047c572504619d09fd47c9d6be'