im.pidgin.pidgin: 25148666afa153d299e40d80150d8f634248d1f5

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 25148666afa153d299e40d80150d8f634248d1f5
Ancestor: bc9860a748e1570dd84f3743dd22c9834f2d38aa
Ancestor: e8fa6e02ff781b7fa39b211e7617c5083ea42688
Author: datallah at pidgin.im
Date: 2007-10-14T20:03:55
Branch: im.pidgin.pidgin

Modified files:
        Doxyfile.in libpurple/certificate.h libpurple/dnsquery.h
        libpurple/network.c
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/qq_proxy.c
        libpurple/protocols/qq/udp_proxy_s5.c libpurple/proxy.c
        libpurple/prpl.h libpurple/win32/global.mak
        libpurple/win32/libc_interface.c
        libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h

ChangeLog: 

merge of 'bc9860a748e1570dd84f3743dd22c9834f2d38aa'
     and 'e8fa6e02ff781b7fa39b211e7617c5083ea42688'