pidgin: a636632c: merge of 'aaddbdd76370264a6f95b6d787b565...

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: a636632c34e757253b9488f72068ffa94dc1727f
Ancestor: aaddbdd76370264a6f95b6d787b565061e3b40d6
Ancestor: ab9a8e940ca290009deae6e3044bc352a0cd9223
Author: kstange at pidgin.im
Date: 2008-09-11T20:58:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a636632c34e757253b9488f72068ffa94dc1727f

Modified files:
        ChangeLog libpurple/dnsquery.c
        libpurple/protocols/msn/soap.c

ChangeLog: 

merge of 'aaddbdd76370264a6f95b6d787b565061e3b40d6'
     and 'ab9a8e940ca290009deae6e3044bc352a0cd9223'