pidgin: f936cb2a: merge of 'f9080d0b3274907da710c3d4d85669...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f936cb2a5d4eb080fa7be1ee1b6599c98e9e12f4
Ancestor: f9080d0b3274907da710c3d4d85669464e418ba4
Ancestor: f9a68099082693adb096e95d47ed2e07d624f526
Author: darkrain42 at pidgin.im
Date: 2009-05-10T22:07:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f936cb2a5d4eb080fa7be1ee1b6599c98e9e12f4

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/oob.h
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/si.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/yahoo/yahoo.c

ChangeLog: 

merge of 'f9080d0b3274907da710c3d4d85669464e418ba4'
     and 'f9a68099082693adb096e95d47ed2e07d624f526'