pidgin: 9979f20f: merge of '86eb900cf982408bb630159b662426...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 9979f20f66bc7efceedd9e288dc78576d9ceeb0c
Ancestor: 86eb900cf982408bb630159b662426812328a78c
Ancestor: 98bb92b730985c4b69ec5cf85884e6a9e3889816
Author: markdoliner at pidgin.im
Date: 2008-12-17T20:56:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9979f20f66bc7efceedd9e288dc78576d9ceeb0c

Modified files:
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/message.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h

ChangeLog: 

merge of '86eb900cf982408bb630159b662426812328a78c'
     and '98bb92b730985c4b69ec5cf85884e6a9e3889816'