im.pidgin.pidgin: 26e91b9e80a9d63c85455f11102f75f36cb95afc

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 26e91b9e80a9d63c85455f11102f75f36cb95afc
Ancestor: b7ee9ed3d96546482462baf63c4127858553c275
Ancestor: fa0e512d79dfe479bc36c2436089b51854ef3eb5
Author: rlaager at pidgin.im
Date: 2007-10-12T03:49:39
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog.API configure.ac doc/conversation-signals.dox
        doc/gtkconv-signals.dox doc/notify-signals.dox
        finch/gntaccount.h finch/gntblist.h finch/gntsound.h
        finch/libgnt/gnt.h finch/libgnt/gntslider.h
        finch/libgnt/gntstyle.h finch/libgnt/gnttextview.h
        finch/libgnt/gnttree.h finch/libgnt/gntutils.h
        finch/libgnt/gntws.h finch/libgnt/test/Makefile
        libpurple/certificate.h libpurple/conversation.h
        libpurple/eventloop.h libpurple/ft.h libpurple/pluginpref.h
        libpurple/prefs.h libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c libpurple/sslconn.h
        pidgin/gtkblist.c pidgin/gtkblist.h pidgin/gtkconv.h
        pidgin/gtkdocklet.c pidgin/gtkimhtml.h pidgin/gtklog.c
        pidgin/gtkutils.h

ChangeLog: 

merge of 'b7ee9ed3d96546482462baf63c4127858553c275'
     and 'fa0e512d79dfe479bc36c2436089b51854ef3eb5'