Revision 04d5b730e989c3ade5910586e68addc25c30bd7c

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 04d5b730e989c3ade5910586e68addc25c30bd7c
Ancestor: 0c6d125066d754b13d41953911c8ea86f0289ec4
Ancestor: bc1e79e2ceda5e8b0b01d5cef92e7eade132e518
Author: sadrul at pidgin.im
Date: 2007-06-26T19:46:26
Branch: im.pidgin.pidgin

Modified files:
        COPYRIGHT libpurple/Makefile.am
        libpurple/plugins/perl/scripts/signals-test.pl
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_common.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/util.c
        libpurple/protocols/qq/Makefile.mingw
        libpurple/win32/win32dep.c pidgin/eggtrayicon.c
        pidgin/gtkblist.c pidgin/gtkconv.c

ChangeLog: 

merge of '0c6d125066d754b13d41953911c8ea86f0289ec4'
     and 'bc1e79e2ceda5e8b0b01d5cef92e7eade132e518'


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