Revision db850ab42d8f30eaba15fafaa3dc5ec1137141e7

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: db850ab42d8f30eaba15fafaa3dc5ec1137141e7
Ancestor: 1e84e66f6954510525d3db02bb2899bca1caacdb
Ancestor: d47f20dcdb0fc5877e4e74981796382067cbd2a6
Author: seanegan at pidgin.im
Date: 2007-08-27T17:17:04
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h libpurple/prpl.h
        libpurple/server.c pidgin/gtkconv.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkimhtmltoolbar.h
        pidgin/pidginstock.c pidgin/pidginstock.h

ChangeLog: 

merge of '1e84e66f6954510525d3db02bb2899bca1caacdb'
     and 'd47f20dcdb0fc5877e4e74981796382067cbd2a6'


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