pidgin: d4111c3c: merge of '3f1d2c03aab34120c7c659a581ffa8...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: d4111c3c390e4fbea55bfa213f353d6012f249d5
Ancestor: 3f1d2c03aab34120c7c659a581ffa8d156041d51
Ancestor: 6b26dbc439fec2159e7e9f20b2a3161288ca1c98
Author: darkrain42 at pidgin.im
Date: 2009-07-07T17:44:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d4111c3c390e4fbea55bfa213f353d6012f249d5

Modified files:
        ChangeLog Makefile.mingw libpurple/ft.c
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/plugins/perl/perl.c libpurple/protocols/msn/msn.c
        libpurple/util.c libpurple/win32/global.mak
        libpurple/win32/targets.mak libpurple/win32/win32dep.c
        pidgin/gtkblist.c pidgin/gtkrequest.c pidgin/gtkutils.c
        pidgin/plugins/disco/xmppdisco.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '3f1d2c03aab34120c7c659a581ffa8d156041d51'
     and '6b26dbc439fec2159e7e9f20b2a3161288ca1c98'