Revision b7f428992fcfe7a3b951fe6744811d854fd0de26

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: b7f428992fcfe7a3b951fe6744811d854fd0de26
Ancestor: 6b3fcad145ab021816608354346c6d702aa590b5
Ancestor: fe818d30608f3d34690e3a676ffdab97247a55a0
Author: sadrul at pidgin.im
Date: 2007-06-24T19:22:28
Branch: im.pidgin.pidgin

Modified files:
        finch/gntplugin.c 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/gtkprivacy.c
        pidgin/gtksavedstatuses.c pidgin/gtkstatusbox.c
        pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/plugins/gtkbuddynote.c

ChangeLog: 

merge of '6b3fcad145ab021816608354346c6d702aa590b5'
     and 'fe818d30608f3d34690e3a676ffdab97247a55a0'


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