Revision d9301e72ad0662ea1f2d56586db18ca25c81ce90

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: d9301e72ad0662ea1f2d56586db18ca25c81ce90
Ancestor: 4e303e0d82031bfb84148de1b35be7efabbb36f7
Ancestor: 522048c8056ba8571da0e228fa9b9570d65da0eb
Author: markdoliner at pidgin.im
Date: 2007-05-23T06:28:36
Branch: im.pidgin.pidgin

Modified files:
        AUTHORS libpurple/ft.c libpurple/protocols/msn/msn.c
        libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_alert.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_bos.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_popup.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/misc.c
        libpurple/protocols/oscar/msgcookie.c
        libpurple/protocols/oscar/oft.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/rxhandlers.c
        libpurple/protocols/oscar/snac.c
        libpurple/protocols/oscar/tlv.c
        libpurple/protocols/oscar/util.c
        libpurple/purple-url-handler libpurple/util.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkprefs.c
        pidgin/gtksound.c pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '4e303e0d82031bfb84148de1b35be7efabbb36f7'
     and '522048c8056ba8571da0e228fa9b9570d65da0eb'


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