Revision f5f8007efe5fa34c57b3d36c5b18617b54929508

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: f5f8007efe5fa34c57b3d36c5b18617b54929508
Ancestor: 0c762d61f5be8c4ba458aa835171bbe53c00ca27
Ancestor: 3d9ad21b9c0c4d5a8c44a212c0a97e8b4c6dd0b6
Author: markdoliner at pidgin.im
Date: 2007-09-09T07:54:44
Branch: im.pidgin.pidgin

Modified files:
        libpurple/certificate.c libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c

ChangeLog: 

merge of '0c762d61f5be8c4ba458aa835171bbe53c00ca27'
     and '3d9ad21b9c0c4d5a8c44a212c0a97e8b4c6dd0b6'


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