pidgin: a9f65952: merge of '1a465eae5dc1b7bfc09b0724788403...

Mon Jul 14 00:41:41 EDT 2008

-----------------------------------------------------------------
Revision: a9f65952c8fc4bc64184d76ce00331688b21b17a
Ancestor: 1a465eae5dc1b7bfc09b0724788403c096f461ce
Ancestor: 532937221446ba2643f5101c22ae58abc83fa1be
Author: qulogic at pidgin.im
Date: 2008-07-14T03:04:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a9f65952c8fc4bc64184d76ce00331688b21b17a

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API finch/gntconv.c
        libpurple/core.c libpurple/plugins/autoaccept.c
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/irc/irc.c
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/nexus.c libpurple/util.c
        libpurple/util.h pidgin/gtkdocklet.c

ChangeLog: 

merge of '1a465eae5dc1b7bfc09b0724788403c096f461ce'
     and '532937221446ba2643f5101c22ae58abc83fa1be'