pidgin: c4f034d2: merge of '5f39c0c7a9b42095bfdc5a3a637fc2...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: c4f034d22d3a0ec8eb6f3e0dfd5802b978cbf4c2
Ancestor: 5f39c0c7a9b42095bfdc5a3a637fc280da38d729
Ancestor: 8e99bf9be800f9578d7e94cc4d522d435cfc80dd
Author: deryni at pidgin.im
Date: 2009-01-07T02:59:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c4f034d22d3a0ec8eb6f3e0dfd5802b978cbf4c2

Modified files:
        ChangeLog.API configure.ac doc/Makefile.am
        finch/libgnt/gntmain.c finch/libgnt/gnttree.c
        finch/libgnt/gntwindow.c finch/libgnt/gntwm.c
        finch/libgnt/wms/irssi.c
        libpurple/plugins/perl/common/PluginPref.xs
        libpurple/plugins/perl/perl-handlers.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/qq/im.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/sametime/Makefile.mingw
        pidgin/plugins/notify.c

ChangeLog: 

merge of '5f39c0c7a9b42095bfdc5a3a637fc280da38d729'
     and '8e99bf9be800f9578d7e94cc4d522d435cfc80dd'