im.pidgin.pidgin: f40157419977d71485a1267ab20230377527fd2f

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: f40157419977d71485a1267ab20230377527fd2f
Ancestor: 80428952b570d014e6a4014048edcf0bde18eebb
Ancestor: c7c88ffd833bca4ab16f164907b32ea5dff2ae6a
Author: seanegan at pidgin.im
Date: 2007-10-25T18:51:45
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/bonjour/jabber.c pidgin/gtkconv.c
        pidgin/gtkimhtml.c pidgin/gtkimhtml.h

ChangeLog: 

merge of '80428952b570d014e6a4014048edcf0bde18eebb'
     and 'c7c88ffd833bca4ab16f164907b32ea5dff2ae6a'