pidgin: 26e23ab9: merge of '3899adf4bc769e54b5338f295574ed...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 26e23ab91560b6065ecfbd282960e82668431a93
Ancestor: 3899adf4bc769e54b5338f295574ed8389025068
Ancestor: ffa776d4a76c39b04bbb031ff24e92e3712a1f8b
Author: datallah at pidgin.im
Date: 2008-09-11T21:25:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/26e23ab91560b6065ecfbd282960e82668431a93

Modified files:
        ChangeLog libpurple/protocols/yahoo/yahoo_auth.c
        libpurple/protocols/yahoo/yahoo_auth.h pidgin/gtkprefs.c
        pidgin/gtksavedstatuses.c pidgin/gtkstatusbox.c

ChangeLog: 

merge of '3899adf4bc769e54b5338f295574ed8389025068'
     and 'ffa776d4a76c39b04bbb031ff24e92e3712a1f8b'