pidgin: 1a28007a: merge of '9643d7374ca3732ca4269075429908...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 1a28007ac4dc0436fda34e35baea9ca3d7932b6b
Ancestor: 9643d7374ca3732ca4269075429908a3d1645f4e
Ancestor: f14f01f8a9d75635cc0532e1e4ad84911c83aa5a
Author: markdoliner at pidgin.im
Date: 2008-12-17T03:03:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1a28007ac4dc0436fda34e35baea9ca3d7932b6b

Modified files:
        ChangeLog libpurple/sslconn.c

ChangeLog: 

merge of '9643d7374ca3732ca4269075429908a3d1645f4e'
     and 'f14f01f8a9d75635cc0532e1e4ad84911c83aa5a'