pidgin: 67228440: merge of '4ba10f028ed5e73f7fe9f00b313184...

Sun Jul 5 11:16:41 EDT 2009

-----------------------------------------------------------------
Revision: 67228440771b545dc01526f74fd7171a02fb5e08
Ancestor: 4ba10f028ed5e73f7fe9f00b3131844819ed85a6
Ancestor: 70479082260072a56b0aea40ccca311822c17155
Author: deryni at pidgin.im
Date: 2009-05-22T00:38:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/67228440771b545dc01526f74fd7171a02fb5e08

Modified files:
        ChangeLog doc/notify-signals.dox libpurple/account.c
        libpurple/buddyicon.h libpurple/dnsquery.c
        libpurple/protocols/jabber/presence.c pidgin/Makefile.am

ChangeLog: 

merge of '4ba10f028ed5e73f7fe9f00b3131844819ed85a6'
     and '70479082260072a56b0aea40ccca311822c17155'