pidgin: 90b8f3a8: merge of '5d1e097eb7e127d7b1bc269ee71992...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 90b8f3a86dc4e3a40bee83272b9def28ae2b2602
Ancestor: 5d1e097eb7e127d7b1bc269ee71992478f79a182
Ancestor: d455bbecfc1b674264ec56b2b4af22db845058ed
Author: nosnilmot at pidgin.im
Date: 2008-03-13T01:44:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/90b8f3a86dc4e3a40bee83272b9def28ae2b2602

Modified files:
        libpurple/plugins/joinpart.c
        libpurple/protocols/oscar/oscar.c pidgin/gtkplugin.c
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gevolution/new_person_dialog.c

ChangeLog: 

merge of '5d1e097eb7e127d7b1bc269ee71992478f79a182'
     and 'd455bbecfc1b674264ec56b2b4af22db845058ed'