pidgin: 232b8f58: merge of '1765bbc5f2dd4d43054659bea654f9...

Wed Jul 2 13:01:25 EDT 2008

-----------------------------------------------------------------
Revision: 232b8f588f062d0f87b489ed65088328581995ff
Ancestor: 1765bbc5f2dd4d43054659bea654f9bd822d2c2e
Ancestor: 3008dd1f70a9e9ddc2bbe30c0fae7aba334836fe
Author: rlaager at pidgin.im
Date: 2008-07-02T16:53:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/232b8f588f062d0f87b489ed65088328581995ff

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_list.h
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/im.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c

ChangeLog: 

merge of '1765bbc5f2dd4d43054659bea654f9bd822d2c2e'
     and '3008dd1f70a9e9ddc2bbe30c0fae7aba334836fe'