pidgin: b060669c: propagate from branch 'im.pidgin.pidgin....

Wed May 5 01:30:46 EDT 2010

-----------------------------------------------------------------
Revision: b060669c75e310157924baab4aa716f3cda4f3b9
Ancestor: 52cb0cc1b49e76b923073e23934af6c8471b984b
Ancestor: e2b248cde7da3263203e398bf5511f43bc1359b0
Author: rekkanoryo at pidgin.im
Date: 2010-05-05T05:26:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b060669c75e310157924baab4aa716f3cda4f3b9

Modified files:
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/mxit/protocol.c po/ca.po po/de.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin.mxit' (head 52cb0cc1b49e76b923073e23934af6c8471b984b)
            to branch 'im.pidgin.pidgin' (head e2b248cde7da3263203e398bf5511f43bc1359b0)