pidgin: 3ee7b50a: merge of 'dc85c2329304dd6f567820b5593919...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 3ee7b50a104560d579c7c5de785bea5675d135b3
Ancestor: dc85c2329304dd6f567820b55939193328f9e506
Ancestor: e0c898b6c75ee358dd659b7fde7551c304f48413
Author: sadrul at pidgin.im
Date: 2008-05-03T03:02:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3ee7b50a104560d579c7c5de785bea5675d135b3

Modified files:
        ChangeLog libpurple/protocols/msn/command.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c pidgin/gtkimhtml.c

ChangeLog: 

merge of 'dc85c2329304dd6f567820b55939193328f9e506'
     and 'e0c898b6c75ee358dd659b7fde7551c304f48413'