Revision 611dfb5d230bae1c633d4f0c2a8af4b58c9fc159

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 611dfb5d230bae1c633d4f0c2a8af4b58c9fc159
Ancestor: 399a02c013c99bd424dd48e241b264b786754576
Ancestor: 9beed54f9b14fec268ec3cecae10261a9d43e1c8
Author: markdoliner at pidgin.im
Date: 2007-06-24T17:07:34
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/.todo
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/oscar/peer.c libpurple/util.c
        libpurple/util.h libpurple/xmlnode.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/plugins/gtkbuddynote.c

ChangeLog: 

merge of '399a02c013c99bd424dd48e241b264b786754576'
     and '9beed54f9b14fec268ec3cecae10261a9d43e1c8'


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