soc.2008.finch: 595903b0: merge of '135c547e211a043c7188e7a6a25587...

Mon Sep 22 23:05:28 EDT 2008

-----------------------------------------------------------------
Revision: 595903b0fefb57cd9a3973dbad45c252a90bb445
Ancestor: 135c547e211a043c7188e7a6a25587c2ad5b7c8f
Ancestor: 62fd7c5eb0c1a0fcc5bdfb7d993501edfbd51608
Author: sadrul at pidgin.im
Date: 2008-09-23T03:12:00
Branch: im.pidgin.soc.2008.finch
URL: http://d.pidgin.im/viewmtn/revision/info/595903b0fefb57cd9a3973dbad45c252a90bb445

Modified files:
        ChangeLog finch/libgnt/wms/tiling.c libpurple/dnsquery.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/qq/utils.h libpurple/proxy.c
        pidgin/gtkimhtml.c pidgin/gtkmenutray.c
        pidgin/plugins/pidginrc.c

ChangeLog: 

merge of '135c547e211a043c7188e7a6a25587c2ad5b7c8f'
     and '62fd7c5eb0c1a0fcc5bdfb7d993501edfbd51608'