im.pidgin.pidgin: 91693085a71d31037a9bbe0743802ed307b3ece4

[wabz at pidgin.im]

-----------------------------------------------------------------
Revision: 91693085a71d31037a9bbe0743802ed307b3ece4
Ancestor: 0e466dc371b6b9abc7e5c3e8fbccfb5eabd06439
Ancestor: 9b60657732e2c9dfce01b3f77e91a1bead862eab
Author: wabz at pidgin.im
Date: 2007-12-03T07:02:48
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog ChangeLog.API doc/finch.1.in finch/gntblist.c
        finch/gntconv.c finch/libgnt/gntcolors.c
        finch/libgnt/gntstyle.c finch/libgnt/gntstyle.h
        finch/libgnt/test/tv.c libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/header_info.h pidgin/gtkconv.c
        pidgin/gtkmain.c po/POTFILES.in

ChangeLog: 

merge of '0e466dc371b6b9abc7e5c3e8fbccfb5eabd06439'
     and '9b60657732e2c9dfce01b3f77e91a1bead862eab'