pidgin: 9804728d: merge of '6fa0af5f032b1afd95354c3d775785...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 9804728d8412930412ec4faaa29230268879586d
Ancestor: 6fa0af5f032b1afd95354c3d775785458390b3da
Ancestor: 7f8f2c1da8b80a800985048fe1895bfee3c1676c
Author: deryni at pidgin.im
Date: 2009-03-11T21:49:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9804728d8412930412ec4faaa29230268879586d

Added files:
        libpurple/plugins/one_time_password.c
Modified files:
        COPYRIGHT doc/funniest_home_convos.txt
        doc/notify-signals.dox libpurple/connection.h libpurple/ft.c
        libpurple/plugins/Makefile.am
        libpurple/protocols/jabber/jabber.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 pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkmain.c
        po/ca.po

ChangeLog: 

merge of '6fa0af5f032b1afd95354c3d775785458390b3da'
     and '7f8f2c1da8b80a800985048fe1895bfee3c1676c'