pidgin: 5573ab30: merge of '71a628a1d60524a087f0cb356fd642...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 5573ab30de2e34d78f13bad8ae0b2ac5de6d1083
Ancestor: 71a628a1d60524a087f0cb356fd6425036c72bee
Ancestor: d1b0914c480b5166f0687409b6a396866208d502
Author: malu at pidgin.im
Date: 2009-03-15T20:22:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5573ab30de2e34d78f13bad8ae0b2ac5de6d1083

Modified files:
        COPYRIGHT ChangeLog.API libpurple/account.h libpurple/ft.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.h libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkmain.c
        po/ca.po

ChangeLog: 

merge of '71a628a1d60524a087f0cb356fd6425036c72bee'
     and 'd1b0914c480b5166f0687409b6a396866208d502'