pidgin: ce9316b2: merge of '35c36f4798530acf3c07ab0acf0c5e...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: ce9316b2f6f374cb09b30126eef41bcf32e87df9
Ancestor: 35c36f4798530acf3c07ab0acf0c5e7af98c0f48
Ancestor: c94e3f15ffb8d4f569d41661e7a89c1c441947ce
Author: malu at pidgin.im
Date: 2010-03-03T22:08:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ce9316b2f6f374cb09b30126eef41bcf32e87df9

Added files:
        pidgin/win32/nsis/generate_gtk_zip.sh
Modified files:
        .mtn-ignore ChangeLog.win32 Makefile.mingw libpurple/log.c
        libpurple/plugins/perl/common/module.h
        libpurple/plugins/perl/perl-common.h
        libpurple/plugins/ssl/Makefile.mingw
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/null/nullprpl.c libpurple/prpl.h
        libpurple/win32/global.mak libpurple/win32/libc_interface.c
        libpurple/win32/win32dep.c pidgin/Makefile.am
        pidgin/gtkblist.c pidgin/win32/nsis/pidgin-installer.nsi
Modified attrs:
        pidgin/win32/nsis/generate_gtk_zip.sh

ChangeLog: 

merge of '35c36f4798530acf3c07ab0acf0c5e7af98c0f48'
     and 'c94e3f15ffb8d4f569d41661e7a89c1c441947ce'