pidgin: a0b2c783: merge of '2a68f533ef12aaf2b26c7827857687...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: a0b2c783a2e0d0d5cd83d13ee1ce1d078b174ba3
Ancestor: 2a68f533ef12aaf2b26c7827857687c4ff04b229
Ancestor: 8022890df03cfa8cce52f7dee5b12ad58b64bbe6
Author: qulogic at pidgin.im
Date: 2008-07-19T03:10:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a0b2c783a2e0d0d5cd83d13ee1ce1d078b174ba3

Modified files:
        configure.ac libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_status.c
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/char_conv.h
        libpurple/protocols/qq/group_conv.c
        libpurple/protocols/qq/group_free.c
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/qq_trans.h
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/prpl.c
        libpurple/prpl.h libpurple/server.c libpurple/server.h
        libpurple/win32/libc_interface.c pidgin/gtkaccount.c

ChangeLog: 

merge of '2a68f533ef12aaf2b26c7827857687c4ff04b229'
     and '8022890df03cfa8cce52f7dee5b12ad58b64bbe6'