Revision 5fda75104115d0a95c1e214b6b3ca18c4dc86a0c

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 5fda75104115d0a95c1e214b6b3ca18c4dc86a0c
Ancestor: 05931acee44dc92b25bb11c8d65ccf224d7f0ea8
Ancestor: 1c2aa9589d0454ffcbf69e05a63cd3da005b3c2c
Author: datallah at pidgin.im
Date: 2007-09-18T03:10:40
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/markup.h
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/session.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/myspace/zap.h libpurple/status.c
        pidgin/gtkdocklet.c pidgin.spec.in

ChangeLog: 

merge of '05931acee44dc92b25bb11c8d65ccf224d7f0ea8'
     and '1c2aa9589d0454ffcbf69e05a63cd3da005b3c2c'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 5fda75104115d0a95c1e214b6b3ca18c4dc86a0c