Revision 5c2d6effc264261827fe521b1ae841611b61dde6

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 5c2d6effc264261827fe521b1ae841611b61dde6
Ancestor: 3d155cfe6d5da449233ba5c19a6f5fea1a33467d
Ancestor: 85d3a31151de8461340501f24062fb9e2545dd99
Author: rlaager at pidgin.im
Date: 2007-05-29T05:40:45
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkprefs.c pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/emotes/default/22/theme

ChangeLog: 

merge of '3d155cfe6d5da449233ba5c19a6f5fea1a33467d'
     and '85d3a31151de8461340501f24062fb9e2545dd99'


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