pidgin: 25e6cb3c: merge of '44df11dd9d1db0245be1ab1ac54108...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 25e6cb3cd762fe0e3dbb5ce67dd017555c8a26a8
Ancestor: 44df11dd9d1db0245be1ab1ac5410821b1c9f2af
Ancestor: 47119315e21668ee63084a57c70abbbba5400cb4
Author: sadrul at pidgin.im
Date: 2008-09-04T22:56:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/25e6cb3cd762fe0e3dbb5ce67dd017555c8a26a8

Modified files:
        configure.ac finch/libgnt/wms/Makefile.am
        libpurple/sslconn.h pidgin/gtkconv.c

ChangeLog: 

merge of '44df11dd9d1db0245be1ab1ac5410821b1c9f2af'
     and '47119315e21668ee63084a57c70abbbba5400cb4'