im.pidgin.pidgin: 22963f332a80135af80a80919aee45d70dd0e1c0

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 22963f332a80135af80a80919aee45d70dd0e1c0
Ancestor: 5a8a1c7157bbb174029ef625cbf079604f7ad7fa
Ancestor: ee665e939ab5c8c3da1f8f62d844250bb01a84bf
Author: evands at pidgin.im
Date: 2007-11-19T08:07:09
Branch: im.pidgin.pidgin

Modified files:
        Makefile.mingw libpurple/Makefile.mingw
        libpurple/buddyicon.c libpurple/ft.c
        libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/notification.h
        libpurple/protocols/msnp9/user.c
        libpurple/protocols/msnp9/user.h
        libpurple/protocols/msnp9/userlist.c pidgin/Makefile.mingw
        pidgin/pixmaps/Makefile.mingw

ChangeLog: 

merge of '5a8a1c7157bbb174029ef625cbf079604f7ad7fa'
     and 'ee665e939ab5c8c3da1f8f62d844250bb01a84bf'