pidgin: d4f8aee1: merge of '43b8c66366c5dc03c717fa9d938446...

Mon Jun 8 00:45:34 EDT 2009

-----------------------------------------------------------------
Revision: d4f8aee1d3652ea813fb31dbfa3b480d28716dc9
Ancestor: 43b8c66366c5dc03c717fa9d938446752df53293
Ancestor: cd775ef3764162a2493ef7060750cd8c8ef544d4
Author: qulogic at pidgin.im
Date: 2009-06-08T04:40:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d4f8aee1d3652ea813fb31dbfa3b480d28716dc9

Modified files:
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/xmppdisco.c
        pidgin/plugins/disco/xmppdisco.h

ChangeLog: 

merge of '43b8c66366c5dc03c717fa9d938446752df53293'
     and 'cd775ef3764162a2493ef7060750cd8c8ef544d4'