pidgin: 43b7acac: merge of '849a753dc5505c801cd053591778dd...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 43b7acace91a5872a8f104f1ec26fea47892faea
Ancestor: 849a753dc5505c801cd053591778ddd340db6337
Ancestor: aec1adb73ee28586c6f762aabd481c41158b4d9f
Author: darkrain42 at pidgin.im
Date: 2009-06-23T06:45:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/43b7acace91a5872a8f104f1ec26fea47892faea

Modified files:
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/zap.c

ChangeLog: 

merge of '849a753dc5505c801cd053591778ddd340db6337'
     and 'aec1adb73ee28586c6f762aabd481c41158b4d9f'