Revision dff846c19b3c14ce3094dda9a5b72c70e6e11121

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: dff846c19b3c14ce3094dda9a5b72c70e6e11121
Ancestor: a1e49bdf5d79109f7becf1a5b25ab023070524c9
Ancestor: b57b523dfd1778a15b58163ee82cd5e31d7cf57d
Author: seanegan at pidgin.im
Date: 2007-06-08T20:55:13
Branch: im.pidgin.pidgin

Modified files:
        COPYRIGHT 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
        libpurple/protocols/simple/simple.c
        libpurple/win32/libc_interface.c pidgin/gtkaccount.c
        pidgin/gtkpounce.c

ChangeLog: 

merge of 'a1e49bdf5d79109f7becf1a5b25ab023070524c9'
     and 'b57b523dfd1778a15b58163ee82cd5e31d7cf57d'


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