Revision 5c3a62771d95514499159e4aad89386e497bb568

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 5c3a62771d95514499159e4aad89386e497bb568
Ancestor: 53b8831e57f625eca0980aca94f04416b32bcd8f
Ancestor: 8fc0ffbe3c0f235feff0ff133d652737adfd1279
Author: rlaager at pidgin.im
Date: 2007-07-23T20:49:01
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/protocols/sametime/sametime.c
        libpurple/purple-remote libpurple/util.c pidgin/gtkconv.c
        pidgin/gtkprefs.c pidgin/gtkrequest.c po/POTFILES.in

ChangeLog: 

merge of '53b8831e57f625eca0980aca94f04416b32bcd8f'
     and '8fc0ffbe3c0f235feff0ff133d652737adfd1279'


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