pidgin: 9a3da5c1: merge of 'd9f0ebaae821730c1fb7373ace99e9...

Tue Feb 16 12:36:02 EST 2010

-----------------------------------------------------------------
Revision: 9a3da5c145a6616c7389b7587d18a3c6c9c531a1
Ancestor: d9f0ebaae821730c1fb7373ace99e91e9d796562
Ancestor: dfce70a37f48336ba138aa2095158c7a16fad292
Author: sadrul at pidgin.im
Date: 2010-02-16T17:36:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9a3da5c145a6616c7389b7587d18a3c6c9c531a1

Modified files:
        libpurple/certificate.c pidgin/gtkprefs.c

ChangeLog: 

merge of 'd9f0ebaae821730c1fb7373ace99e91e9d796562'
     and 'dfce70a37f48336ba138aa2095158c7a16fad292'