pidgin: 2a195c64: merge of '2010b6cf9dfaf940d22f5593c63b22...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 2a195c64281f3e4d2712dbe7d148d688dbdea252
Ancestor: 2010b6cf9dfaf940d22f5593c63b22db86ee8844
Ancestor: 7142fad92bc4df6efc61c59c9115cb247b95810b
Author: darkrain42 at pidgin.im
Author: sadrul at pidgin.im
Date: 2009-07-08T04:06:38
Date: 2009-07-08T04:07:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2a195c64281f3e4d2712dbe7d148d688dbdea252

Modified files:
        ChangeLog Makefile.mingw libpurple/Makefile.am
        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/gtkaccount.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 '2010b6cf9dfaf940d22f5593c63b22db86ee8844'
     and '7142fad92bc4df6efc61c59c9115cb247b95810b'