pidgin: d1b0914c: merge of '9ae083b7093cb3dc764443a54dbb8d...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: d1b0914c480b5166f0687409b6a396866208d502
Ancestor: 9ae083b7093cb3dc764443a54dbb8d2abe84a0b8
Ancestor: e13689e4856dc0f8c93c715c70c76bce6a2babca
Author: qulogic at pidgin.im
Date: 2009-03-13T04:32:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d1b0914c480b5166f0687409b6a396866208d502

Modified files:
        ChangeLog.API libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/parser.c libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h

ChangeLog: 

merge of '9ae083b7093cb3dc764443a54dbb8d2abe84a0b8'
     and 'e13689e4856dc0f8c93c715c70c76bce6a2babca'