pidgin: a20a4541: merge of 'a6c4b3ed3fdfcd5eafd45342656fed...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: a20a45414d71cd9c0ab697cf0d6209bea8d9140c
Ancestor: a6c4b3ed3fdfcd5eafd45342656fed541020f353
Ancestor: ae28e0b0bf4488cc755ccad2b98841440ad6fe70
Author: qulogic at pidgin.im
Date: 2009-07-31T04:09:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a20a45414d71cd9c0ab697cf0d6209bea8d9140c

Added files:
        share/ca-certs/Thawte_Premium_Server_CA.pem
Modified files:
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        pidgin/win32/nsis/pidgin-installer.nsi
        share/ca-certs/Makefile.am

ChangeLog: 

merge of 'a6c4b3ed3fdfcd5eafd45342656fed541020f353'
     and 'ae28e0b0bf4488cc755ccad2b98841440ad6fe70'