pidgin: ad05ad0a: merge of 'e9bb03a6ee65b531aedba74676ce2d...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: ad05ad0ab9adf12fcfef66c99fe6ac5368479cc1
Ancestor: e9bb03a6ee65b531aedba74676ce2dbb1b9a8491
Ancestor: edb54b594e0ce2d7d9e63f52b22b5060df6bf8e8
Author: qulogic at pidgin.im
Date: 2009-07-20T05:11:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ad05ad0ab9adf12fcfef66c99fe6ac5368479cc1

Modified files:
        ChangeLog ChangeLog.API libpurple/Makefile.am
        libpurple/dnsquery.c libpurple/dnssrv.c libpurple/network.c
        libpurple/network.h libpurple/plugins/Makefile.am
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h libpurple/util.c
        pidgin/plugins/Makefile.am pidgin.desktop.in

ChangeLog: 

merge of 'e9bb03a6ee65b531aedba74676ce2dbb1b9a8491'
     and 'edb54b594e0ce2d7d9e63f52b22b5060df6bf8e8'