im.pidgin.pidgin: 4d50bf3b08569aa2108a9f5da47fb1548d0c7dd9

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 4d50bf3b08569aa2108a9f5da47fb1548d0c7dd9
Ancestor: 067c06f2c33e5371796629696a9aad6afa4e9ead
Ancestor: e7a18c70a00a0534e1e6f7956970e10d6d0b69ec
Author: lschiere at pidgin.im
Date: 2007-10-09T13:41:11
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/oscar.c pidgin/gtkblist.c
        pidgin/gtkconv.c

ChangeLog: 

merge of '067c06f2c33e5371796629696a9aad6afa4e9ead'
     and 'e7a18c70a00a0534e1e6f7956970e10d6d0b69ec'