pidgin: b6a5e4ff: merge of '7829ec76bdb008583f8da54e238c22...

Sun Mar 22 23:11:12 EDT 2009

-----------------------------------------------------------------
Revision: b6a5e4ff2031056de1ab02b445572a506ebe7780
Ancestor: 7829ec76bdb008583f8da54e238c2265a1140db2
Ancestor: e10c42213b8452c2fd4906e4ca501ef3eb83bd69
Author: paul at darkrain42.org
Date: 2009-03-20T05:46:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b6a5e4ff2031056de1ab02b445572a506ebe7780

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API libpurple/blist.h
        libpurple/circbuffer.c libpurple/dnssrv.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/si.c libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h pidgin/gtkdialogs.c
        pidgin/gtknotify.c pidgin/gtknotify.h pidgin/gtkpounce.c
        pidgin/gtkprefs.c

ChangeLog: 

merge of '7829ec76bdb008583f8da54e238c2265a1140db2'
     and 'e10c42213b8452c2fd4906e4ca501ef3eb83bd69'