pidgin: 8b7637a4: merge of '557198948608028bc4f826a546a394...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 8b7637a4e51e07808d86aa9e531bc9e890d53812
Ancestor: 557198948608028bc4f826a546a3948c4899bdf0
Ancestor: f34a9d45f9fd63b92e95fe69115042eadbe7c053
Author: markdoliner at pidgin.im
Date: 2010-02-03T22:02:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8b7637a4e51e07808d86aa9e531bc9e890d53812

Modified files:
        ChangeLog libpurple/protocols/jabber/message.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h

ChangeLog: 

merge of '557198948608028bc4f826a546a3948c4899bdf0'
     and 'f34a9d45f9fd63b92e95fe69115042eadbe7c053'