pidgin: 955e420a: merge of 'c3ed9a8c89dd38d30b7ad93055507b...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 955e420a0acad1f07022838ed6457894f600859a
Ancestor: c3ed9a8c89dd38d30b7ad93055507b679b2f0f76
Ancestor: ef660d19c58b200a67bf94b3e8cbf0fd562a7f1d
Author: sadrul at pidgin.im
Date: 2009-06-27T23:49:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/955e420a0acad1f07022838ed6457894f600859a

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h po/ChangeLog

ChangeLog: 

merge of 'c3ed9a8c89dd38d30b7ad93055507b679b2f0f76'
     and 'ef660d19c58b200a67bf94b3e8cbf0fd562a7f1d'