Revision 2a3b163efb32d6c8631c49f0da7f368e21e194a4

[wehlhard at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 2a3b163efb32d6c8631c49f0da7f368e21e194a4
Ancestor: 03ea20ce538dad585a5a2d40778f242a1fd85a4b
Ancestor: 04e67ab53da79e8268e027ed9b4423c64c6b86ee
Author: wehlhard at soc.pidgin.im
Date: 2007-05-31T00:40:46
Branch: im.pidgin.soc.2007.certmgr

Modified files:
        libpurple/cipher.c libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/prefs.h libpurple/sslconn.h

ChangeLog: 

merge of '03ea20ce538dad585a5a2d40778f242a1fd85a4b'
     and '04e67ab53da79e8268e027ed9b4423c64c6b86ee'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 2a3b163efb32d6c8631c49f0da7f368e21e194a4