pidgin: 10055bc9: merge of '50aec6ba5a9f9c1c535bbb23989229...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 10055bc9c44d63b38c5279aa2578ad96f442b56d
Ancestor: 50aec6ba5a9f9c1c535bbb23989229593f3ff2ef
Ancestor: 59d56711bc1fccc226a6508d153bae1466437969
Author: paul at darkrain42.org
Date: 2009-03-25T06:35:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/10055bc9c44d63b38c5279aa2578ad96f442b56d

Modified files:
        ChangeLog pidgin/gtkaccount.c
        pidgin/plugins/gevolution/gevolution.h

ChangeLog: 

merge of '50aec6ba5a9f9c1c535bbb23989229593f3ff2ef'
     and '59d56711bc1fccc226a6508d153bae1466437969'