Revision 6096404018084d5ea24f916c8e757d64e237dbd7

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 6096404018084d5ea24f916c8e757d64e237dbd7
Ancestor: 05f7badcad9471084218e698a5c011908d17af90
Ancestor: 88066f9b13ceb09d6de93a2d30d8e49a6840fdf9
Author: rlaager at pidgin.im
Date: 2007-04-24T03:56:03
Branch: im.pidgin.pidgin

Modified files:
        COPYRIGHT ChangeLog libpurple/nat-pmp.c
        libpurple/plugins/tcl/tcl_ref.c libpurple/prefs.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/send_file.c
        libpurple/win32/giowin32.c pidgin/gtkaccount.c
        pidgin/gtkstatusbox.c pidgin/pixmaps/emotes/default/22/theme

ChangeLog: 

merge of '05f7badcad9471084218e698a5c011908d17af90'
     and '88066f9b13ceb09d6de93a2d30d8e49a6840fdf9'


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