pidgin: 9df36977: merge of '73e463add9a124c86554c2958526e1...

[xake at rymdraket.net]

-----------------------------------------------------------------
Revision: 9df36977fc8f70d1b3124d32a54eb123df50aa0f
Ancestor: 73e463add9a124c86554c2958526e1a6ee5fc22f
Ancestor: 9d2e2c1cd6d653a56af68a602532212502bd9317
Author: xake at rymdraket.net
Date: 2009-03-16T21:44:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9df36977fc8f70d1b3124d32a54eb123df50aa0f

Modified files:
        COPYRIGHT ChangeLog 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/purple-url-handler libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkmain.c
        pidgin/gtknotify.c pidgin/gtknotify.h pidgin/gtkpounce.c
        po/ca.po

ChangeLog: 

merge of '73e463add9a124c86554c2958526e1a6ee5fc22f'
     and '9d2e2c1cd6d653a56af68a602532212502bd9317'