Revision 06f9dbd73b69e26dc9f56873a9ce106146bb1b18

[am at adiumx.com]

-----------------------------------------------------------------
Revision: 06f9dbd73b69e26dc9f56873a9ce106146bb1b18
Ancestor: 56282c0e590e48f68f48934e6d0fe5bb4ecd518b
Ancestor: 71ed79a95ae8fc95aafeebbea64a8adcf4db8bfd
Author: am at adiumx.com
Date: 2007-07-11T15:59:09
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 '56282c0e590e48f68f48934e6d0fe5bb4ecd518b'
     and '71ed79a95ae8fc95aafeebbea64a8adcf4db8bfd'


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