Revision 740e52eb4e03d068ad431e2db0d5563f63a7daea

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 740e52eb4e03d068ad431e2db0d5563f63a7daea
Ancestor: 0485ab28f09f39d5e0b47621901f1f0ba0c26c5e
Ancestor: 496506f552dcc01dcc38820f472dc9d27a82a997
Author: rlaager at pidgin.im
Date: 2007-09-10T20:09:34
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog.API libpurple/conversation.c
        libpurple/conversation.h
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/yahoo/yahoo.c libpurple/prpl.h
        libpurple/server.c

ChangeLog: 

merge of '0485ab28f09f39d5e0b47621901f1f0ba0c26c5e'
     and '496506f552dcc01dcc38820f472dc9d27a82a997'


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