pidgin: 197be95e: merge of '9a8c2abfdbcf669fd21ec24f4aa474...

Wed Apr 22 14:45:33 EDT 2009

-----------------------------------------------------------------
Revision: 197be95e924af577788e8842130520f5fbead667
Ancestor: 9a8c2abfdbcf669fd21ec24f4aa474ac55a2ecb9
Ancestor: fe650fc58681996bf988489a65e10198e25c1fd3
Author: malu at pidgin.im
Date: 2009-04-22T18:39:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/197be95e924af577788e8842130520f5fbead667

Modified files:
        ChangeLog libpurple/protocols/jabber/jingle/content.c
        pidgin/gtkconv.c

ChangeLog: 

merge of '9a8c2abfdbcf669fd21ec24f4aa474ac55a2ecb9'
     and 'fe650fc58681996bf988489a65e10198e25c1fd3'