Revision dd8217e407806698d48c60d254c9ad7f8c7dba24

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: dd8217e407806698d48c60d254c9ad7f8c7dba24
Ancestor: 03da073664bc840f76d0cec53eea61517337c5a7
Ancestor: 7a42aa3364e820295fa0a820d9fc4af116bae86f
Author: datallah at pidgin.im
Date: 2007-06-08T15:37:48
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/bonjour/mdns_common.c
        libpurple/protocols/bonjour/mdns_types.h
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/jabber/jabber.c pidgin/gtkaccount.c
        pidgin/gtkpounce.c

ChangeLog: 

merge of '03da073664bc840f76d0cec53eea61517337c5a7'
     and '7a42aa3364e820295fa0a820d9fc4af116bae86f'


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