pidgin: 5e5c83f0: merge of '6b951d62be418d5bfc437a1ab747c6...

Tue Dec 16 14:40:45 EST 2008

-----------------------------------------------------------------
Revision: 5e5c83f0df1b90822ca4be016dd65eb254ad28c7
Ancestor: 6b951d62be418d5bfc437a1ab747c6ba900d7979
Ancestor: d9facf0b24577675796e6ff34f126f1eb0699e27
Author: markdoliner at pidgin.im
Date: 2008-12-16T19:36:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5e5c83f0df1b90822ca4be016dd65eb254ad28c7

Modified files:
        ChangeLog libpurple/protocols/myspace/myspace.c
        libpurple/protocols/simple/simple.c po/fi.po po/fr.po

ChangeLog: 

merge of '6b951d62be418d5bfc437a1ab747c6ba900d7979'
     and 'd9facf0b24577675796e6ff34f126f1eb0699e27'