pidgin: 21778067: merge of '02b9e2a56048af7440e6752b0a4d65...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 2177806778437c5b7a6d0cfe9696189b14ba5c89
Ancestor: 02b9e2a56048af7440e6752b0a4d65df7c519ae7
Ancestor: 5cffa941d7a297ad42b518e4c97e930a0ad54cd5
Author: darkrain42 at pidgin.im
Date: 2009-06-23T19:06:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2177806778437c5b7a6d0cfe9696189b14ba5c89

Added files:
        libpurple/protocols/oscar/clientlogin.c
Modified files:
        configure.ac libpurple/cipher.c
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscar_data.c
        libpurple/protocols/oscar/oscarcommon.h

ChangeLog: 

merge of '02b9e2a56048af7440e6752b0a4d65df7c519ae7'
     and '5cffa941d7a297ad42b518e4c97e930a0ad54cd5'