pidgin: a0c82d87: merge of '372b94fab52b770bd8535062006525...

Thu Mar 6 10:55:45 EST 2008

-----------------------------------------------------------------
Revision: a0c82d871b8a50a84bf70c59b05105bbfdd4d331
Ancestor: 372b94fab52b770bd853506200652575d0588539
Ancestor: e4b22781fe6c2a7cd1133ee36a308ede967be25e
Author: sadrul at pidgin.im
Date: 2008-03-06T15:55:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a0c82d871b8a50a84bf70c59b05105bbfdd4d331

Modified files:
        configure.ac finch/gntblist.c finch/gntconv.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/yahoo/yahoo.c libpurple/proxy.c
        pidgin/gtkmain.c pidgin/gtksound.c

ChangeLog: 

merge of '372b94fab52b770bd853506200652575d0588539'
     and 'e4b22781fe6c2a7cd1133ee36a308ede967be25e'