pidgin: b0098e22: merge of 'aee5a93203f807e81fd88cc655fb27...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: b0098e2250f135d121960d8152e144e7e344125e
Ancestor: aee5a93203f807e81fd88cc655fb27908cd17ff3
Ancestor: c7225ba15472ba524ee80edc66505a2829948b95
Author: sadrul at pidgin.im
Date: 2010-02-05T14:40:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b0098e2250f135d121960d8152e144e7e344125e

Modified files:
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/state.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/session.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c pidgin/gtkstatusbox.c

ChangeLog: 

merge of 'aee5a93203f807e81fd88cc655fb27908cd17ff3'
     and 'c7225ba15472ba524ee80edc66505a2829948b95'