pidgin: 5d96a5bd: merge of '7b270e8b949f20550eec69f904e57b...

Thu Sep 11 17:20:37 EDT 2008

-----------------------------------------------------------------
Revision: 5d96a5bdba3c5650184ab079f3f09ba588eb1d9a
Ancestor: 7b270e8b949f20550eec69f904e57b5431a83f10
Ancestor: f12c8903079425d7850fa183df0b3f937b2952be
Author: rlaager at pidgin.im
Date: 2008-09-11T21:13:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5d96a5bdba3c5650184ab079f3f09ba588eb1d9a

Modified files:
        libpurple/dnsquery.c libpurple/protocols/msn/soap.c
        pidgin/gtkblist.c pidgin/gtkprefs.c
        pidgin/gtksavedstatuses.c pidgin/gtkstatusbox.c

ChangeLog: 

merge of '7b270e8b949f20550eec69f904e57b5431a83f10'
     and 'f12c8903079425d7850fa183df0b3f937b2952be'