pidgin: f14f01f8: merge of 'ef05d478fa7019dbdddad2f30968a7...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: f14f01f8a9d75635cc0532e1e4ad84911c83aa5a
Ancestor: ef05d478fa7019dbdddad2f30968a729d943520e
Ancestor: fc380f1f9dbecc5cf95926b84af50a1ce091b5c3
Author: datallah at pidgin.im
Date: 2008-12-17T02:40:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f14f01f8a9d75635cc0532e1e4ad84911c83aa5a

Modified files:
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/persist.h libpurple/sslconn.c

ChangeLog: 

merge of 'ef05d478fa7019dbdddad2f30968a729d943520e'
     and 'fc380f1f9dbecc5cf95926b84af50a1ce091b5c3'