pidgin: 4b868c40: merge of '063be233b9574325479d819c9c68bf...

Sat May 16 16:35:26 EDT 2009

-----------------------------------------------------------------
Revision: 4b868c40c990df3155a7300397fb9bcd9971fcd5
Ancestor: 063be233b9574325479d819c9c68bf52551435d7
Ancestor: b7a9a556a47e7f06d11e8fcdee75a6bd4b164de3
Author: sadrul at pidgin.im
Date: 2009-05-16T20:37:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4b868c40c990df3155a7300397fb9bcd9971fcd5

Modified files:
        .mtn-ignore libpurple/account.c libpurple/blist.c
        libpurple/dnsquery.c libpurple/network.c
        libpurple/plugins/perl/perl-handlers.c libpurple/prefs.c
        libpurple/savedstatuses.c libpurple/util.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c pidgin/gtkimhtml.h
        pidgin/gtkstatusbox.c

ChangeLog: 

merge of '063be233b9574325479d819c9c68bf52551435d7'
     and 'b7a9a556a47e7f06d11e8fcdee75a6bd4b164de3'