pidgin: 43597c04: merge of '541f6529c3dbec16782707ce37eb82...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 43597c046102d28beb11884ac70e89943a1b1466
Ancestor: 541f6529c3dbec16782707ce37eb8206f95fc92e
Ancestor: e4c829c5c55062700c14f234887b29ade8239b63
Author: deryni at pidgin.im
Date: 2008-03-04T02:48:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/43597c046102d28beb11884ac70e89943a1b1466

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        Makefile.am NEWS configure.ac doc/funniest_home_convos.txt
        doc/ui-ops.dox finch/libgnt/gntwm.c libpurple/account.c
        libpurple/buddyicon.c libpurple/eventloop.h
        libpurple/plugin.c libpurple/plugins/test.pl
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/cmds.c
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msnp9/msn-utils.c
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/zephyr/zephyr.c
        libpurple/win32/global.mak pidgin/gtkblist.c
        pidgin/gtkdialogs.c pidgin/gtkplugin.c
        pidgin/plugins/notify.c pidgin/win32/winpidgin.c

ChangeLog: 

merge of '541f6529c3dbec16782707ce37eb8206f95fc92e'
     and 'e4c829c5c55062700c14f234887b29ade8239b63'