im.pidgin.cpw.khc.msnp14.ticket393: 2ef96c42807885b7c63105a185b36f37e5aae464

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 2ef96c42807885b7c63105a185b36f37e5aae464
Ancestor: 35029673d220ad9d89c1ad7cf63ce92f75bd60b6
Ancestor: 3f2aa5da39f8bf4e248d0168cddb3f350814cc61
Author: rlaager at pidgin.im
Date: 2007-10-04T21:41:28
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/cmdproc.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/group.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msg.h
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/object.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/table.c
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/userlist.c
        libpurple/win32/global.mak

ChangeLog: 

explicit merge of '3f2aa5da39f8bf4e248d0168cddb3f350814cc61'
              and '35029673d220ad9d89c1ad7cf63ce92f75bd60b6'
        to branch 'im.pidgin.cpw.khc.msnp14.ticket393'