pidgin: a466d13b: merge of '1cb1b4ee3379b50280fbc97f2c889a...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: a466d13b3d95f820b89489b1b33af51c6b71eae5
Ancestor: 1cb1b4ee3379b50280fbc97f2c889a43cd7c8c41
Ancestor: 83046a7036aafc5be7f10950286bb2112398789d
Author: rlaager at pidgin.im
Date: 2008-10-25T18:09:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a466d13b3d95f820b89489b1b33af51c6b71eae5

Modified files:
        configure.ac finch/gntblist.c libpurple/circbuffer.c
        libpurple/core.c libpurple/plugins/ssl/Makefile.am
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/plugins/ssl/ssl-nss.c libpurple/proxy.c
        libpurple/util.c pidgin/gtkimhtml.c pidgin/gtkstatusbox.c
        pidgin/plugins/notify.c

ChangeLog: 

merge of '1cb1b4ee3379b50280fbc97f2c889a43cd7c8c41'
     and '83046a7036aafc5be7f10950286bb2112398789d'