pidgin: 2980a882: merge of '47697d74271a33e8dfe15fdeef4210...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 2980a8828dae367476dcf5d8e52783fdc137d8bf
Ancestor: 47697d74271a33e8dfe15fdeef4210b3ca9b762f
Ancestor: a878de35a8972daab016ed05e7af50043bd856ca
Author: darkrain42 at pidgin.im
Date: 2009-11-17T23:05:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2980a8828dae367476dcf5d8e52783fdc137d8bf

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/usermood.c
        libpurple/tests/test_jabber_jutil.c

ChangeLog: 

merge of '47697d74271a33e8dfe15fdeef4210b3ca9b762f'
     and 'a878de35a8972daab016ed05e7af50043bd856ca'