pidgin: cf08cfd4: merge of '946d948a1aa4270fa46dabca767e9d...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: cf08cfd4801c15dfdc26c3875ea3dfad3e28f9c8
Ancestor: 946d948a1aa4270fa46dabca767e9d727d4519eb
Ancestor: 949fb9967a8d4bcae83af4ebc6b2681f26b17f5a
Author: markdoliner at pidgin.im
Date: 2008-04-17T07:09:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cf08cfd4801c15dfdc26c3875ea3dfad3e28f9c8

Modified files:
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/msnp9/userlist.c

ChangeLog: 

merge of '946d948a1aa4270fa46dabca767e9d727d4519eb'
     and '949fb9967a8d4bcae83af4ebc6b2681f26b17f5a'