pidgin: d4439257: merge of '245104c3da64bf99627578bd68d6cd...

Wed May 7 23:25:39 EDT 2008

-----------------------------------------------------------------
Revision: d4439257c99d0ccf8ce17dca0d614d2e3582fb30
Ancestor: 245104c3da64bf99627578bd68d6cda42ee16b43
Ancestor: 68e91ac241a8cba7102b6f868b76189a265c6d5b
Author: sadrul at pidgin.im
Date: 2008-05-08T03:22:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d4439257c99d0ccf8ce17dca0d614d2e3582fb30

Modified files:
        libpurple/protocols/oscar/oscar.c libpurple/util.c
        pidgin/gtkconv.c pidgin/gtknotify.c pidgin/gtksound.c
        pidgin/gtkstatusbox.c pidgin/gtkutils.c

ChangeLog: 

merge of '245104c3da64bf99627578bd68d6cda42ee16b43'
     and '68e91ac241a8cba7102b6f868b76189a265c6d5b'