pidgin: 087c5864: merge of '18b85ae6ad8091af43d91826cf054e...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 087c5864fefbb9ea8e8985e0ecc1783ee18502cb
Ancestor: 18b85ae6ad8091af43d91826cf054e4569ba74aa
Ancestor: 5a7c739baddaf14efccf2017d05e0f9bb5b7278a
Author: sadrul at pidgin.im
Date: 2010-02-10T16:46:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/087c5864fefbb9ea8e8985e0ecc1783ee18502cb

Modified files:
        ChangeLog ChangeLog.API configure.ac finch/libgnt/gnttree.c
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/perl/perl-common.h
        libpurple/plugins/perl/perl-handlers.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c libpurple/util.h
        libpurple/xmlnode.c

ChangeLog: 

merge of '18b85ae6ad8091af43d91826cf054e4569ba74aa'
     and '5a7c739baddaf14efccf2017d05e0f9bb5b7278a'