pidgin: 7e096393: merge of '3dba2c274943bbb9eb35dbbf06b905...

Tue Aug 4 00:25:27 EDT 2009

-----------------------------------------------------------------
Revision: 7e0963939e06903e78ffae5f699f302ac3f4f7db
Ancestor: 3dba2c274943bbb9eb35dbbf06b9053d9c195933
Ancestor: aacbe07782ea562b3fd3b7cd615f22041e73f3e6
Author: qulogic at pidgin.im
Date: 2009-08-04T04:19:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7e0963939e06903e78ffae5f699f302ac3f4f7db

Modified files:
        libpurple/certificate.c libpurple/protocols/msn/slp.c

ChangeLog: 

merge of '3dba2c274943bbb9eb35dbbf06b9053d9c195933'
     and 'aacbe07782ea562b3fd3b7cd615f22041e73f3e6'