Revision 03ea20ce538dad585a5a2d40778f242a1fd85a4b

[wehlhard at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 03ea20ce538dad585a5a2d40778f242a1fd85a4b
Ancestor: b30d119437548516a2f7b28d4172f8fcd6238d10
Ancestor: d7da32c69fe39372cde96fb7c4b454b673c75ea7
Author: wehlhard at soc.pidgin.im
Date: 2007-05-31T00:40:36
Branch: im.pidgin.soc.2007.certmgr

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

ChangeLog: 

merge of 'b30d119437548516a2f7b28d4172f8fcd6238d10'
     and 'd7da32c69fe39372cde96fb7c4b454b673c75ea7'


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