pidgin.vv: 9025972b: merge of 'a2ba1fead74d00991a9b2fe1290f77...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 9025972b9b7cb70f535b8430f711aa17e7d4db2f
Ancestor: a2ba1fead74d00991a9b2fe1290f7716b1d9d5cf
Ancestor: b434abf35e2efd2a1c2821cbaf1ff557219ba4ad
Author: maiku at soc.pidgin.im
Date: 2009-03-16T02:59:37
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/9025972b9b7cb70f535b8430f711aa17e7d4db2f

Added files:
        libpurple/plugins/one_time_password.c
Modified files:
        COPYRIGHT ChangeLog.API doc/funniest_home_convos.txt
        libpurple/account.h libpurple/connection.h libpurple/ft.c
        libpurple/media.c libpurple/plugins/Makefile.am
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/notification.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
        po/ca.po

ChangeLog: 

merge of 'a2ba1fead74d00991a9b2fe1290f7716b1d9d5cf'
     and 'b434abf35e2efd2a1c2821cbaf1ff557219ba4ad'