pidgin: 319edba5: merge of '21745356545795bcec9c44cff0e779...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 319edba55f1c66810f6a7a2af17e808a5bc75e3e
Ancestor: 21745356545795bcec9c44cff0e779429c5092c6
Ancestor: 39fc4acd81cf1796220d3ed4fff0b17bc5acf6de
Author: qulogic at pidgin.im
Date: 2009-08-16T03:27:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/319edba55f1c66810f6a7a2af17e808a5bc75e3e

Modified files:
        ChangeLog finch/libgnt/gntkeys.c pidgin/gtkblist.c
        pidgin/gtkcertmgr.c

ChangeLog: 

merge of '21745356545795bcec9c44cff0e779429c5092c6'
     and '39fc4acd81cf1796220d3ed4fff0b17bc5acf6de'