pidgin: c8b2d8fd: merge of '1a03b83dbe8f941cb6de4ed3659bf7...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: c8b2d8fd76b54ee11c854f9db5f8817247d748e8
Ancestor: 1a03b83dbe8f941cb6de4ed3659bf7b2335d642d
Ancestor: bda22ced802132e741a614cf3e67a599e9b08b0c
Author: nosnilmot at pidgin.im
Date: 2008-03-13T01:24:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c8b2d8fd76b54ee11c854f9db5f8817247d748e8

Modified files:
        libpurple/plugins/joinpart.c pidgin/plugins/cap/cap.c
        pidgin/plugins/gevolution/gevo-util.c

ChangeLog: 

merge of '1a03b83dbe8f941cb6de4ed3659bf7b2335d642d'
     and 'bda22ced802132e741a614cf3e67a599e9b08b0c'