im.pidgin.pidgin: cff05fbceab1d88163770d13a4c7a6116bdeb8ee

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: cff05fbceab1d88163770d13a4c7a6116bdeb8ee
Ancestor: 74560aca587ea20e9eee77e340f6ba9fb7aca914
Ancestor: fa0a15922c052e62854538389d21f7391d569a50
Author: nosnilmot at pidgin.im
Date: 2007-12-12T01:53:00
Branch: im.pidgin.pidgin

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

ChangeLog: 

merge of '74560aca587ea20e9eee77e340f6ba9fb7aca914'
     and 'fa0a15922c052e62854538389d21f7391d569a50'