Revision 6f0e5f2bca1aa8629cb779e8e6152dcd94fbf966

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: 6f0e5f2bca1aa8629cb779e8e6152dcd94fbf966
Ancestor: 4d22d26e21a84d8f6fbb484b3b01e88eff143ca3
Ancestor: c5667c23f0afbeaad2ec711f202f2f0b13c699dc
Author: seanegan at pidgin.im
Date: 2007-07-23T04:26:49
Branch: im.pidgin.pidgin

Modified files:
        finch/gntblist.c libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/tlv.c libpurple/util.c
        pidgin/gtkconv.c pidgin/gtkrequest.c

ChangeLog: 

merge of '4d22d26e21a84d8f6fbb484b3b01e88eff143ca3'
     and 'c5667c23f0afbeaad2ec711f202f2f0b13c699dc'


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