pidgin: c2555c19: merge of '016d96cd3d2c3e0c9966b9209bae22...

Fri Jan 1 04:01:00 EST 2010

-----------------------------------------------------------------
Revision: c2555c19a1eba04c61a07d8c6d53fd3b95cfef1f
Ancestor: 016d96cd3d2c3e0c9966b9209bae225a8d3cb696
Ancestor: c64a1adc8bda2b4aeaae1f273541afbc4f71b810
Author: qulogic at pidgin.im
Date: 2010-01-01T08:32:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c2555c19a1eba04c61a07d8c6d53fd3b95cfef1f

Modified files:
        COPYRIGHT ChangeLog.API finch/gntidle.c finch/gntrequest.c
        finch/gntstatus.c finch/libgnt/gntinternal.h
        finch/libgnt/gntline.c finch/libgnt/gntmenuitem.c
        finch/libgnt/gntmenuitemcheck.c
        finch/libgnt/gntprogressbar.c finch/libgnt/gntslider.c
        finch/libgnt/gntwidget.c finch/libgnt/gntwindow.c
        finch/libgnt/wms/irssi.c libpurple/conversation.h
        libpurple/ft.c libpurple/media.h
        libpurple/plugins/perl/common/Log.xs
        libpurple/plugins/perl/common/Proxy.xs
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/mxit/splashscreen.c pidgin/gtkconv.c

ChangeLog: 

merge of '016d96cd3d2c3e0c9966b9209bae225a8d3cb696'
     and 'c64a1adc8bda2b4aeaae1f273541afbc4f71b810'