Revision 795a3d9baa3c96bae20af1c1bfa0b7179c0cac99

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 795a3d9baa3c96bae20af1c1bfa0b7179c0cac99
Ancestor: 51e0efe487e61c55de88411e33a7da6b122c2cf0
Ancestor: 7934f56129bd4b9802a28d56f1e65f90a286d2f9
Author: nosnilmot at pidgin.im
Date: 2007-04-22T17:59:19
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/oscar.c pidgin/gtkstatusbox.c
        pidgin/gtkstatusbox.h pidgin.spec.in

ChangeLog: 

merge of '51e0efe487e61c55de88411e33a7da6b122c2cf0'
     and '7934f56129bd4b9802a28d56f1e65f90a286d2f9'


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