pidgin: f9a68099: merge of 'bc166fa1753ca1852b8b0dd0566d93...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f9a68099082693adb096e95d47ed2e07d624f526
Ancestor: bc166fa1753ca1852b8b0dd0566d93a85644884f
Ancestor: e160cbb1c4048444bbd3bff885d56e49eb34ee1e
Author: darkrain42 at pidgin.im
Date: 2009-05-10T22:00:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f9a68099082693adb096e95d47ed2e07d624f526

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

ChangeLog: 

merge of 'bc166fa1753ca1852b8b0dd0566d93a85644884f'
     and 'e160cbb1c4048444bbd3bff885d56e49eb34ee1e'