im.pidgin.pidgin: db0689a4f6edbe8ef311f16047b3203ed94d24f8

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: db0689a4f6edbe8ef311f16047b3203ed94d24f8
Ancestor: 9d8120be512c235d76a8f6fee60cae024da8772e
Ancestor: db2e3703b266820d3b1c3f65a5b8ce05163f62de
Author: nosnilmot at pidgin.im
Date: 2007-11-03T20:21:59
Branch: im.pidgin.pidgin

Modified files:
        Makefile.mingw libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/msn/contact.c pidgin/gtkprefs.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '9d8120be512c235d76a8f6fee60cae024da8772e'
     and 'db2e3703b266820d3b1c3f65a5b8ce05163f62de'