Revision 56282c0e590e48f68f48934e6d0fe5bb4ecd518b

[am at adiumx.com]

-----------------------------------------------------------------
Revision: 56282c0e590e48f68f48934e6d0fe5bb4ecd518b
Ancestor: 007f0633f939c4b61b75da8298db7ffd31dcb105
Ancestor: 417a908e6df613a5d005b70eb687e8f7b31d69b3
Author: am at adiumx.com
Date: 2007-07-11T15:59:08
Branch: im.pidgin.soc.2007.xmpp

Modified files:
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/xdata.c libpurple/util.c

ChangeLog: 

merge of '007f0633f939c4b61b75da8298db7ffd31dcb105'
     and '417a908e6df613a5d005b70eb687e8f7b31d69b3'


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