pidgin: 1b8605fe: merge of '73eedf837c2384f502418f09130078...

Mon May 3 22:30:27 EDT 2010

-----------------------------------------------------------------
Revision: 1b8605fe894a84e4c8bff472b7212dbc5fc4853a
Ancestor: 73eedf837c2384f502418f091300785c19ccfacd
Ancestor: 80ca41a75331b3ca9b4c2a4efa04d72104f4909e
Author: darkrain42 at pidgin.im
Date: 2010-05-04T02:22:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1b8605fe894a84e4c8bff472b7212dbc5fc4853a

Modified files:
        libpurple/protocols/jabber/auth_cyrus.c

ChangeLog: 

merge of '73eedf837c2384f502418f091300785c19ccfacd'
     and '80ca41a75331b3ca9b4c2a4efa04d72104f4909e'