pidgin: b7e8c44c: merge of '1864a53b79ca34679ff68b45b52e73...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: b7e8c44c307d8c76ec8baf9f5de889131d8bec6d
Ancestor: 1864a53b79ca34679ff68b45b52e7385608e46cc
Ancestor: 269c9bb016ef464d143d1bbd66dca0fa03030aa3
Author: darkrain42 at pidgin.im
Date: 2009-05-21T04:49:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b7e8c44c307d8c76ec8baf9f5de889131d8bec6d

Modified files:
        ChangeLog libpurple/dnsquery.c
        libpurple/protocols/jabber/presence.c

ChangeLog: 

merge of '1864a53b79ca34679ff68b45b52e7385608e46cc'
     and '269c9bb016ef464d143d1bbd66dca0fa03030aa3'