pidgin: 8dc70099: merge of '60045dbace89be557466fc68978290...

Wed Sep 10 18:05:52 EDT 2008

-----------------------------------------------------------------
Revision: 8dc700994ec5d152ef4553445e3ae21db5138543
Ancestor: 60045dbace89be557466fc68978290d5fe8b491d
Ancestor: b341289e9194564cc4f7250228a66b854c2ec3c5
Author: markdoliner at pidgin.im
Date: 2008-09-10T21:59:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8dc700994ec5d152ef4553445e3ae21db5138543

Modified files:
        .mtn-ignore libpurple/dnsquery.c pidgin/gtkblist.c
        pidgin/gtkprefs.c pidgin/gtksavedstatuses.c
        pidgin/gtkstatusbox.c po/POTFILES.in

ChangeLog: 

merge of '60045dbace89be557466fc68978290d5fe8b491d'
     and 'b341289e9194564cc4f7250228a66b854c2ec3c5'