Revision e1962c10ee8b7bef56b5057119aa09037c0186ae

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: e1962c10ee8b7bef56b5057119aa09037c0186ae
Ancestor: bf68a58b8bbc1d43f4ebe7b94bd47282cb66f26e
Ancestor: daa5fcdfa800915c5bed0df9809e1b367f6b56da
Author: khc at pidgin.im
Date: 2007-09-03T21:04:02
Branch: im.pidgin.pidgin

Modified files:
        COPYRIGHT ChangeLog.API libpurple/account.c
        libpurple/conversation.c libpurple/protocols/msn/slp.c
        libpurple/protocols/myspace/CHANGES
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/release.sh
        libpurple/protocols/oscar/oscar.c libpurple/stun.c
        libpurple/util.c pidgin/gtkaccount.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c

ChangeLog: 

merge of 'bf68a58b8bbc1d43f4ebe7b94bd47282cb66f26e'
     and 'daa5fcdfa800915c5bed0df9809e1b367f6b56da'


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