Revision c41f4a042c7fd12301b7a3acdf8d766cbb4fc8ea

[wehlhard at soc.pidgin.im]

-----------------------------------------------------------------
Revision: c41f4a042c7fd12301b7a3acdf8d766cbb4fc8ea
Ancestor: 4b282994660451b15a8a393ef032d32e9bf00d2e
Ancestor: cca063073007b0d29e6e6aaf1b9df55926035009
Author: wehlhard at soc.pidgin.im
Date: 2007-05-31T00:40:09
Branch: im.pidgin.soc.2007.certmgr

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

ChangeLog: 

merge of '4b282994660451b15a8a393ef032d32e9bf00d2e'
     and 'cca063073007b0d29e6e6aaf1b9df55926035009'


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