im.pidgin.cpw.khc.msnp14.ticket393: 35029673d220ad9d89c1ad7cf63ce92f75bd60b6

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 35029673d220ad9d89c1ad7cf63ce92f75bd60b6
Ancestor: a372624892d7949f02f9d4df5412256ce18482f7
Ancestor: d74d8b3f321adce0e7c84c0d73a321acb3f87d11
Author: rlaager at pidgin.im
Date: 2007-10-04T21:24:15
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/msg.c libpurple/protocols/msn/msg.h
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/msnutils.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 'd74d8b3f321adce0e7c84c0d73a321acb3f87d11'
              and 'a372624892d7949f02f9d4df5412256ce18482f7'
        to branch 'im.pidgin.cpw.khc.msnp14.ticket393'