pidgin: fbc51418: merge of 'a758341daab23fe08b983dd3e00c8d...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: fbc5141857873eae0512b7cecad373ea0612207e
Ancestor: a758341daab23fe08b983dd3e00c8db27e225d59
Ancestor: c651e3b4b90d5aa93b3e45769bab26a0d9fa9039
Author: darkrain42 at pidgin.im
Date: 2010-03-20T16:20:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fbc5141857873eae0512b7cecad373ea0612207e

Modified files:
        ChangeLog libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/msgcookie.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/peer.h
        libpurple/protocols/oscar/tlv.c pidgin/gtkblist.c
        pidgin/gtkblist.h pidgin/gtkconv.c pidgin/gtkutils.c
        pidgin/gtkutils.h

ChangeLog: 

merge of 'a758341daab23fe08b983dd3e00c8db27e225d59'
     and 'c651e3b4b90d5aa93b3e45769bab26a0d9fa9039'