pidgin: d7ef198a: merge of '7e1e376dfb1d794f80c1f29679e3e8...

Tue Mar 23 19:31:06 EDT 2010

-----------------------------------------------------------------
Revision: d7ef198af6af51119b3d321c73062edc7971c984
Ancestor: 7e1e376dfb1d794f80c1f29679e3e899208bd856
Ancestor: d1dbbf85441c66810b725eac8586af7febb33118
Author: malu at pidgin.im
Date: 2010-03-23T23:25:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d7ef198af6af51119b3d321c73062edc7971c984

Modified files:
        ChangeLog doc/gtkimhtml-signals.dox
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/message.c

ChangeLog: 

merge of '7e1e376dfb1d794f80c1f29679e3e899208bd856'
     and 'd1dbbf85441c66810b725eac8586af7febb33118'