pidgin: a47f88ca: merge of '65195a427a4340ca3f017d8d052c0b...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: a47f88caa774782909f05a086d8c3d215464417b
Ancestor: 65195a427a4340ca3f017d8d052c0b85c1f482f2
Ancestor: d8d0c78fad568b2380be8a8c68c1474ff3ad4ea5
Author: qulogic at pidgin.im
Date: 2009-09-04T23:08:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a47f88caa774782909f05a086d8c3d215464417b

Modified files:
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/send_file.c pidgin/gtkblist.c

ChangeLog: 

merge of '65195a427a4340ca3f017d8d052c0b85c1f482f2'
     and 'd8d0c78fad568b2380be8a8c68c1474ff3ad4ea5'