pidgin: a5441448: merge of '48605797160fa0786446ea54f38b8b...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: a54414482c5046a5cc797c6c74afedaa45212912
Ancestor: 48605797160fa0786446ea54f38b8b1e963b9f84
Ancestor: cf42e14aa9bf1886fae4e840cc02302a0cde8caf
Author: darkrain42 at pidgin.im
Date: 2009-05-30T00:34:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a54414482c5046a5cc797c6c74afedaa45212912

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/parser.h libpurple/util.c
        libpurple/util.h

ChangeLog: 

merge of '48605797160fa0786446ea54f38b8b1e963b9f84'
     and 'cf42e14aa9bf1886fae4e840cc02302a0cde8caf'