pidgin: f097092b: merge of '1423db68fabc512bc2005d658eb078...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f097092b2172caac2ebaf3c24d14ef9aa874402b
Ancestor: 1423db68fabc512bc2005d658eb078fc65bd6fba
Ancestor: 14624d95d88444c69810193d3cddea741c692fea
Author: darkrain42 at pidgin.im
Date: 2009-07-16T17:07:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f097092b2172caac2ebaf3c24d14ef9aa874402b

Modified files:
        libpurple/protocols/yahoo/yahoochat.c po/fr.po

ChangeLog: 

merge of '1423db68fabc512bc2005d658eb078fc65bd6fba'
     and '14624d95d88444c69810193d3cddea741c692fea'