pidgin: 679b95c6: merge of '2ba63306963eb1bfddbb853da79bd2...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 679b95c6b80b4045e5c2ded165e64f4fca5f1ed8
Ancestor: 2ba63306963eb1bfddbb853da79bd2d2e829af2d
Ancestor: ef02124197316893a5fcc15752bddf97c3cb3406
Author: qulogic at pidgin.im
Date: 2009-01-29T02:00:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/679b95c6b80b4045e5c2ded165e64f4fca5f1ed8

Added files:
        share/ca-certs/VeriSign_International_Server_Class_3_CA.pem
Modified files:
        ChangeLog libpurple/protocols/msn/contact.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/oscar/peer.c
        pidgin/win32/nsis/pidgin-installer.nsi
        share/ca-certs/Makefile.am

ChangeLog: 

merge of '2ba63306963eb1bfddbb853da79bd2d2e829af2d'
     and 'ef02124197316893a5fcc15752bddf97c3cb3406'