pidgin: 45648a25: merge of '5fabe3309f53afaf46157b615ec20e...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 45648a255619d2cd5f706725fa74543ded0409bc
Ancestor: 5fabe3309f53afaf46157b615ec20eec581969e5
Ancestor: fd5955618eddcd84d522b30ff11102f9601f38c8
Author: darkrain42 at pidgin.im
Date: 2009-08-31T20:10:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/45648a255619d2cd5f706725fa74543ded0409bc

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

ChangeLog: 

merge of '5fabe3309f53afaf46157b615ec20eec581969e5'
     and 'fd5955618eddcd84d522b30ff11102f9601f38c8'