pidgin: c6bf32f2: merge of '3d874daf79db017dc2e1a7835cbc6b...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: c6bf32f29e50d11a6acc2f0d1040ffbf69f6979c
Ancestor: 3d874daf79db017dc2e1a7835cbc6b796225156b
Ancestor: 6f9b56bae8ad65742fcad2bd26615457c02f27d3
Author: nosnilmot at pidgin.im
Date: 2008-05-16T18:36:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c6bf32f29e50d11a6acc2f0d1040ffbf69f6979c

Modified files:
        ChangeLog libpurple/core.c
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/buddy.h
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_win32.c

ChangeLog: 

merge of '3d874daf79db017dc2e1a7835cbc6b796225156b'
     and '6f9b56bae8ad65742fcad2bd26615457c02f27d3'