Revision be9e03b2c65a8c0da6ba02fdfd489bc5ec8af57b

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: be9e03b2c65a8c0da6ba02fdfd489bc5ec8af57b
Ancestor: 2e9a9919a68f5a230c81bceb9f0c95eb5e169420
Ancestor: a8a4f4264b01ec0650153f0e2ccdfd23f62336f4
Author: nosnilmot at pidgin.im
Date: 2007-06-04T01:32:47
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/peer_proxy.c
        libpurple/protocols/yahoo/yahoo.c libpurple/util.c
        libpurple/xmlnode.c pidgin/gtkblist.c
        pidgin/plugins/relnot.c

ChangeLog: 

merge of '2e9a9919a68f5a230c81bceb9f0c95eb5e169420'
     and 'a8a4f4264b01ec0650153f0e2ccdfd23f62336f4'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from be9e03b2c65a8c0da6ba02fdfd489bc5ec8af57b