pidgin.next.minor: 1529fa49: merge of 'd667c60d4307344e071846ebcf72ed...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 1529fa495883d559527375c0d8b7fbe68cf019c2
Ancestor: d667c60d4307344e071846ebcf72ed5458183434
Ancestor: e6b0cddc47249918d5697b1f0a4c512db4fef0d3
Author: datallah at pidgin.im
Date: 2009-11-20T00:33:23
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/1529fa495883d559527375c0d8b7fbe68cf019c2

Added files:
        pidgin/win32/nsis/available.lst
Modified files:
        ChangeLog libpurple/media/backend-fs2.c
        libpurple/protocols/Makefile.mingw
        libpurple/protocols/mxit/http.c
        libpurple/protocols/mxit/login.c pidgin/gtkconv.c
        pidgin/gtkprefs.c pidgin/gtkutils.c
        pidgin/plugins/pidginrc.c

ChangeLog: 

merge of 'd667c60d4307344e071846ebcf72ed5458183434'
     and 'e6b0cddc47249918d5697b1f0a4c512db4fef0d3'