pidgin: ae17e331: merge of '569642987f6f11fdb718731b245d60...

Sun Nov 22 18:41:53 EST 2009

-----------------------------------------------------------------
Revision: ae17e3310388ab12be45e1aa6cf84cc7c1337fae
Ancestor: 569642987f6f11fdb718731b245d60f535fe0962
Ancestor: c3164aa8a77e2e8f860904f1e7384e8c9f609890
Author: markdoliner at pidgin.im
Date: 2009-11-22T23:35:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ae17e3310388ab12be45e1aa6cf84cc7c1337fae

Modified files:
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of '569642987f6f11fdb718731b245d60f535fe0962'
     and 'c3164aa8a77e2e8f860904f1e7384e8c9f609890'