pidgin: 8823c1e2: merge of '82af7f1dab568c2a359aaecca4e31e...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 8823c1e2d1cf8e27e5be09b162ecaf6f8c463714
Ancestor: 82af7f1dab568c2a359aaecca4e31e650063e1c1
Ancestor: dc033fa668d3c347dad18340758590733c60050a
Author: sadrul at pidgin.im
Date: 2008-04-25T03:51:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8823c1e2d1cf8e27e5be09b162ecaf6f8c463714

Modified files:
        autogen.sh libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_alert.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_bos.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/misc.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oft.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer_proxy.c
        libpurple/protocols/oscar/tlv.c pidgin/gtkimhtml.c
        pidgin/minidialog.c

ChangeLog: 

merge of '82af7f1dab568c2a359aaecca4e31e650063e1c1'
     and 'dc033fa668d3c347dad18340758590733c60050a'