Revision 6b3fcad145ab021816608354346c6d702aa590b5

[nwalp at pidgin.im]

-----------------------------------------------------------------
Revision: 6b3fcad145ab021816608354346c6d702aa590b5
Ancestor: 683ac90580e5631dcc8b79c3caea1adc7b92ffec
Ancestor: 947b20b6fc725a1f22dd7b7b23ebbaee89f0cfed
Author: nwalp at pidgin.im
Date: 2007-06-24T17:52:52
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/peer.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 '683ac90580e5631dcc8b79c3caea1adc7b92ffec'
     and '947b20b6fc725a1f22dd7b7b23ebbaee89f0cfed'


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