pidgin: 6b905c49: merge of '9804728d8412930412ec4faaa29230...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 6b905c49eee1ae5e6722251efa90cfd92d1fd557
Ancestor: 9804728d8412930412ec4faaa29230268879586d
Ancestor: 99afc19a87766c3beb24ccc126de72da4fef3be9
Author: deryni at pidgin.im
Date: 2009-03-20T00:34:17
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6b905c49eee1ae5e6722251efa90cfd92d1fd557

Modified files:
        ChangeLog ChangeLog.API doc/notify-signals.dox
        libpurple/account.h libpurple/blist.h libpurple/dnssrv.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/oscar.c libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h pidgin/gtknotify.c
        pidgin/gtknotify.h pidgin/gtkpounce.c

ChangeLog: 

merge of '9804728d8412930412ec4faaa29230268879586d'
     and '99afc19a87766c3beb24ccc126de72da4fef3be9'