pidgin: 1f5f9164: merge of '4f0c3aedc3b013ab2175e57b71bab9...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 1f5f9164a8d16cb4a576efa6ad40dfc6b5eb1afc
Ancestor: 4f0c3aedc3b013ab2175e57b71bab92988e4f812
Ancestor: fe4644296ed29ff3456121616137d3b6c04d9ee8
Author: qulogic at pidgin.im
Date: 2010-03-19T02:44:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1f5f9164a8d16cb4a576efa6ad40dfc6b5eb1afc

Modified files:
        ChangeLog libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        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

ChangeLog: 

merge of '4f0c3aedc3b013ab2175e57b71bab92988e4f812'
     and 'fe4644296ed29ff3456121616137d3b6c04d9ee8'