pidgin: 5fabe330: merge of '72c558ad4f7ad4f6c3ef1347e9d202...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 5fabe3309f53afaf46157b615ec20eec581969e5
Ancestor: 72c558ad4f7ad4f6c3ef1347e9d202cebdfaed83
Ancestor: eb7f43240a9076b19941ad012cb5b9046f5cd0ce
Author: darkrain42 at pidgin.im
Date: 2009-08-31T20:07:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5fabe3309f53afaf46157b615ec20eec581969e5

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

ChangeLog: 

merge of '72c558ad4f7ad4f6c3ef1347e9d202cebdfaed83'
     and 'eb7f43240a9076b19941ad012cb5b9046f5cd0ce'