adium: b41bee59: merge of '23616484165976203b578e637f294e...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: b41bee59863f017329ea8b1c554a212c35a03742
Ancestor: 23616484165976203b578e637f294e2d5aa40c0f
Ancestor: 4f68fbd3fa0d628ebaa502175933e527ae11f728
Author: zacw at adiumx.com
Date: 2009-12-01T23:27:26
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/b41bee59863f017329ea8b1c554a212c35a03742

Modified files:
        ChangeLog libpurple/protocols/facebook/fb_managefriends.c
        libpurple/protocols/facebook/libfacebook.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c libpurple/xmlnode.c
        pidgin/plugins/disco/gtkdisco.c

ChangeLog: 

merge of '23616484165976203b578e637f294e2d5aa40c0f'
     and '4f68fbd3fa0d628ebaa502175933e527ae11f728'