pidgin: 5dd45a65: merge of '5abbad5cd71f99c20f09b841f16db2...

[sttwister at gmail.com]

-----------------------------------------------------------------
Revision: 5dd45a65920d3936eba743066aaa34e00084f3bd
Ancestor: 5abbad5cd71f99c20f09b841f16db29597be4cc2
Ancestor: f1504a57f6518466cd61deb44389178f44d729f7
Author: sttwister at gmail.com
Date: 2009-11-22T21:13:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5dd45a65920d3936eba743066aaa34e00084f3bd

Modified files:
        ChangeLog libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

merge of '5abbad5cd71f99c20f09b841f16db29597be4cc2'
     and 'f1504a57f6518466cd61deb44389178f44d729f7'