im.pidgin.cpw.khc.msnp14.ticket393: 3290c5cb7a8e983b5437bf4dc3904f8cd75170c8

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 3290c5cb7a8e983b5437bf4dc3904f8cd75170c8
Ancestor: 50e15bd8b6a1d8386fe764e2307d24f2bc2b70d0
Ancestor: 86c7a43a5dab5c8bd7661dca3f91f44080f33ef9
Author: rlaager at pidgin.im
Date: 2007-10-04T21:47:16
Branch: im.pidgin.cpw.khc.msnp14.ticket393

Modified files:
        configure.ac libpurple/notify.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/command.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msg.h
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/switchboard.h
        libpurple/win32/global.mak

ChangeLog: 

explicit merge of '50e15bd8b6a1d8386fe764e2307d24f2bc2b70d0'
              and '86c7a43a5dab5c8bd7661dca3f91f44080f33ef9'
        to branch 'im.pidgin.cpw.khc.msnp14.ticket393'