pidgin: 58f6605c: merge of '4f7ebd10f9b2db16fa68b60e528f76...

Wed Mar 4 01:40:34 EST 2009

-----------------------------------------------------------------
Revision: 58f6605c38fb10f58f9eba5fc34b4fbbf9db6573
Ancestor: 4f7ebd10f9b2db16fa68b60e528f766e6c9dd450
Ancestor: fc6844685b98c3ba0c8860d00c057d51b436abf2
Author: rekkanoryo at pidgin.im
Date: 2009-03-04T06:34:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/58f6605c38fb10f58f9eba5fc34b4fbbf9db6573

Added files:
        libpurple/plugins/one_time_password.c
Modified files:
        ChangeLog doc/funniest_home_convos.txt
        libpurple/connection.h libpurple/plugins/Makefile.am
        libpurple/protocols/oscar/oscar.c pidgin/gtkblist.c
        pidgin/gtkconn.c

ChangeLog: 

merge of '4f7ebd10f9b2db16fa68b60e528f766e6c9dd450'
     and 'fc6844685b98c3ba0c8860d00c057d51b436abf2'