pidgin: 41238509: merge of '4ede3b155e9d443dcec45785cecef6...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 412385093788630a5cbf089f966c3d00aa3de9c0
Ancestor: 4ede3b155e9d443dcec45785cecef60b7af55de9
Ancestor: a32b7088cc5f5afb18b147305a3b0b278b7c3dfb
Author: qulogic at pidgin.im
Date: 2009-11-23T06:13:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/412385093788630a5cbf089f966c3d00aa3de9c0

Modified files:
        libpurple/protocols/msn/msn.h
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/protocol.c

ChangeLog: 

merge of '4ede3b155e9d443dcec45785cecef60b7af55de9'
     and 'a32b7088cc5f5afb18b147305a3b0b278b7c3dfb'