Revision 555d85985bc1831a4455fc8cbc5de5b164071807

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 555d85985bc1831a4455fc8cbc5de5b164071807
Ancestor: a8189d2840b6823a0faf5dbba937eb0dd96a1416
Ancestor: fa54cd9cb960c227e6c2a03ef194facf1bcdf80a
Author: lschiere at pidgin.im
Date: 2007-08-26T20:49:25
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/roster.c pidgin/gtkdialogs.c

ChangeLog: 

merge of 'a8189d2840b6823a0faf5dbba937eb0dd96a1416'
     and 'fa54cd9cb960c227e6c2a03ef194facf1bcdf80a'


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