pidgin: bd023f94: merge of '19b1f405b1e0f78a95bd14e8303d1a...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: bd023f94e67f08aef22c1e266f1cd1eac0dfd998
Ancestor: 19b1f405b1e0f78a95bd14e8303d1a2c19818908
Ancestor: 884bb785d674029cb52e46cb82a86241df13bf46
Author: markdoliner at pidgin.im
Date: 2010-02-03T21:17:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bd023f94e67f08aef22c1e266f1cd1eac0dfd998

Modified files:
        ChangeLog libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/message.c

ChangeLog: 

merge of '19b1f405b1e0f78a95bd14e8303d1a2c19818908'
     and '884bb785d674029cb52e46cb82a86241df13bf46'