pidgin: 741d3db5: merge of '092bbcea7b768d21baff3362314e78...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 741d3db56d7408a93116c9abcef7c5427f7f8a12
Ancestor: 092bbcea7b768d21baff3362314e784b26b1ced7
Ancestor: 83e6600ffffbfc65ace650330df3f1888e33cb97
Author: qulogic at pidgin.im
Date: 2008-09-23T05:33:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/741d3db56d7408a93116c9abcef7c5427f7f8a12

Modified files:
        ChangeLog finch/libgnt/gntkeys.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoochat.c pidgin/gtkimhtml.c
        pidgin/gtkmenutray.c pidgin/plugins/pidginrc.c
        po/POTFILES.in

ChangeLog: 

merge of '092bbcea7b768d21baff3362314e784b26b1ced7'
     and '83e6600ffffbfc65ace650330df3f1888e33cb97'