im.pidgin.pidgin: 596c9f710fd64a951cbce4bb92b6e051ae3805b1

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: 596c9f710fd64a951cbce4bb92b6e051ae3805b1
Ancestor: 70b3c6fe54dd2678b33b1b1da78c4e66acd20931
Ancestor: f24be9cb8ea385acbcd053e528efbd2bb31b8b1d
Author: seanegan at pidgin.im
Date: 2007-12-18T22:12:10
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog ChangeLog.API finch/libgnt/gntcolors.h
        finch/libgnt/gntstyle.h finch/libgnt/gnttree.h
        libpurple/util.h pidgin/gtkdialogs.c

ChangeLog: 

merge of '70b3c6fe54dd2678b33b1b1da78c4e66acd20931'
     and 'f24be9cb8ea385acbcd053e528efbd2bb31b8b1d'