pidgin: 5d1e097e: merge of 'c27bb03d64e205ff26669ccc173b74...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 5d1e097eb7e127d7b1bc269ee71992478f79a182
Ancestor: c27bb03d64e205ff26669ccc173b7429cad093eb
Ancestor: eced0f42ca756a36e09e9f4adbb007d835ff8795
Author: nosnilmot at pidgin.im
Date: 2008-03-13T01:38:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5d1e097eb7e127d7b1bc269ee71992478f79a182

Modified files:
        libpurple/plugins/joinpart.c
        libpurple/protocols/oscar/oscar.c pidgin/gtkplugin.c
        pidgin/plugins/cap/cap.c

ChangeLog: 

merge of 'c27bb03d64e205ff26669ccc173b7429cad093eb'
     and 'eced0f42ca756a36e09e9f4adbb007d835ff8795'