pidgin: 103b4211: merge of '4f30170cef563ecf059bc5e798c3bd...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 103b421151d9a077e40a662e8d3743b5232f3da4
Ancestor: 4f30170cef563ecf059bc5e798c3bd75d01247e7
Ancestor: a9002d08e75602ce9bcf87e60a05f2b0c7862608
Author: qulogic at pidgin.im
Date: 2008-08-10T22:59:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/103b421151d9a077e40a662e8d3743b5232f3da4

Deleted entries:
        libpurple/protocols/qq/crypt.c
        libpurple/protocols/qq/crypt.h
        libpurple/protocols/qq/group_network.c
        libpurple/protocols/qq/group_network.h
Added files:
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/qq_crypt.h
Modified files:
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_list.h
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/buddy_opt.h
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group.h
        libpurple/protocols/qq/group_find.c
        libpurple/protocols/qq/group_find.h
        libpurple/protocols/qq/group_free.c
        libpurple/protocols/qq/group_free.h
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_im.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/group_internal.h
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_join.h
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/group_opt.h
        libpurple/protocols/qq/group_search.c
        libpurple/protocols/qq/header_info.c
        libpurple/protocols/qq/header_info.h
        libpurple/protocols/qq/im.c libpurple/protocols/qq/im.h
        libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_base.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_network.h
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/qq_trans.h
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/qq/sys_msg.h
        libpurple/protocols/qq/utils.c
        libpurple/protocols/yahoo/yahoo.c po/POTFILES.in

ChangeLog: 

merge of '4f30170cef563ecf059bc5e798c3bd75d01247e7'
     and 'a9002d08e75602ce9bcf87e60a05f2b0c7862608'