Revision de856e854e7d2ff16636232adda4aaeae66f85f9

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: de856e854e7d2ff16636232adda4aaeae66f85f9
Ancestor: 1aba81cae8b963708281123ed6c438ba5861113d
Ancestor: a44fe9cfe3fd6d287a438835c65977f4570da41e
Author: datallah at pidgin.im
Date: 2007-08-09T18:34:01
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/buddy.h
        libpurple/protocols/bonjour/issues.txt
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_common.c
        libpurple/protocols/bonjour/mdns_common.h
        libpurple/protocols/bonjour/mdns_howl.c
        libpurple/protocols/bonjour/mdns_interface.h
        libpurple/protocols/bonjour/mdns_win32.c pidgin/gtkconv.c
        pidgin/gtkdocklet.c pidgin/gtkimhtmltoolbar.c

ChangeLog: 

merge of '1aba81cae8b963708281123ed6c438ba5861113d'
     and 'a44fe9cfe3fd6d287a438835c65977f4570da41e'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from de856e854e7d2ff16636232adda4aaeae66f85f9