pidgin: 66eb0916: merge of 'd1fea663a03e5f80f539918a21f5f3...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 66eb0916d2f9dd7b89e178411d116e41c93687dc
Ancestor: d1fea663a03e5f80f539918a21f5f36c09a452b8
Ancestor: f936cb2a5d4eb080fa7be1ee1b6599c98e9e12f4
Author: khc at pidgin.im
Date: 2009-05-10T22:24:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/66eb0916d2f9dd7b89e178411d116e41c93687dc

Modified files:
        libpurple/internal.h 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 'd1fea663a03e5f80f539918a21f5f36c09a452b8'
     and 'f936cb2a5d4eb080fa7be1ee1b6599c98e9e12f4'