pidgin: 75ee5088: merge of '6f45eed99c94f8e63e46ad382a70c0...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 75ee5088dd032d8cb92093e4430a0e57e469a99d
Ancestor: 6f45eed99c94f8e63e46ad382a70c0c4e266b833
Ancestor: ba8d3b144d041faa33c133fc7dd605eea606c66a
Author: markdoliner at pidgin.im
Date: 2008-06-09T06:35:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/75ee5088dd032d8cb92093e4430a0e57e469a99d

Modified files:
        ChangeLog configure.ac finch/gntconv.c finch/gntft.c
        finch/libgnt/gntcolors.c finch/libgnt/gntcolors.h
        libpurple/Makefile.am libpurple/certificate.c
        libpurple/plugins/perl/perl-handlers.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/oim.h
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/soap2.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_advert.c
        libpurple/protocols/oscar/family_alert.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_bos.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_invite.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_popup.c
        libpurple/protocols/oscar/family_stats.c
        libpurple/protocols/oscar/family_translate.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/yahoo/yahoo_picture.c libpurple/proxy.h
        pidgin/gtkblist.c pidgin/gtkft.c pidgin/gtkimhtml.c
        pidgin/gtksavedstatuses.c po/lt.po
        share/ca-certs/Makefile.am

ChangeLog: 

merge of '6f45eed99c94f8e63e46ad382a70c0c4e266b833'
     and 'ba8d3b144d041faa33c133fc7dd605eea606c66a'