pidgin: f02bc5ac: merge of '91d403bb5dfadec9e38f0c0c058aba...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: f02bc5ac62535f523c8db8f5ee5ae43aa10bc614
Ancestor: 91d403bb5dfadec9e38f0c0c058ababeed6fd9d7
Ancestor: eb16a1c0c5f81e6320a264061588965751a02101
Author: markdoliner at pidgin.im
Date: 2008-12-15T04:09:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f02bc5ac62535f523c8db8f5ee5ae43aa10bc614

Modified files:
        ChangeLog libpurple/protocols/msn/session.c
        libpurple/protocols/myspace/message.c

ChangeLog: 

merge of '91d403bb5dfadec9e38f0c0c058ababeed6fd9d7'
     and 'eb16a1c0c5f81e6320a264061588965751a02101'