Revision 05e0540c1a837fa061087b893a855d20e35011ef

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 05e0540c1a837fa061087b893a855d20e35011ef
Ancestor: 0e092e2c969ff59e242f866fd69d643b77bad18c
Ancestor: 49fd2d3743c303820668e5566f9513c3a16bca71
Author: markdoliner at pidgin.im
Date: 2007-06-10T15:59:10
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/presence.c pidgin/gtkblist.c
        pidgin/gtkdialogs.c

ChangeLog: 

merge of '0e092e2c969ff59e242f866fd69d643b77bad18c'
     and '49fd2d3743c303820668e5566f9513c3a16bca71'


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