Revision 764b939b45fba4d44685d9c85afd28f4a9251179

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: 764b939b45fba4d44685d9c85afd28f4a9251179
Ancestor: 6096404018084d5ea24f916c8e757d64e237dbd7
Ancestor: e50cb51528e4d48fe940dd2aebee80fea945ccd6
Author: kstange at pidgin.im
Date: 2007-04-24T05:14:37
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 '6096404018084d5ea24f916c8e757d64e237dbd7'
     and 'e50cb51528e4d48fe940dd2aebee80fea945ccd6'


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