im.pidgin.pidgin: 74560aca587ea20e9eee77e340f6ba9fb7aca914

Tue Dec 11 19:16:11 EST 2007

-----------------------------------------------------------------
Revision: 74560aca587ea20e9eee77e340f6ba9fb7aca914
Ancestor: 1d77c730a1160c77d14354d4ce61455e59c94fbc
Ancestor: 7db30ca464c9869b5f2058907f65de643c11b7b3
Author: sadrul at pidgin.im
Date: 2007-12-12T00:15:23
Branch: im.pidgin.pidgin

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

ChangeLog: 

merge of '1d77c730a1160c77d14354d4ce61455e59c94fbc'
     and '7db30ca464c9869b5f2058907f65de643c11b7b3'