pidgin: 957a4bbd: merge of '18ddd668ba1cc77ed0a0595a053f8a...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 957a4bbd52c402829dbe3dbe7a88d69e70d00a97
Ancestor: 18ddd668ba1cc77ed0a0595a053f8a2879dddfd0
Ancestor: 63b644ac7791059c9fad6128d17bccebca8ad71a
Author: darkrain42 at pidgin.im
Date: 2010-06-17T21:23:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/957a4bbd52c402829dbe3dbe7a88d69e70d00a97

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/tests/test_jabber_scram.c

ChangeLog: 

merge of '18ddd668ba1cc77ed0a0595a053f8a2879dddfd0'
     and '63b644ac7791059c9fad6128d17bccebca8ad71a'