# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1249014088 0
# Node ID ae86b03162aadd350976a990914e883473737238
# Parent  1a6c2144ba087897a698f502c3508e55b23d0565# Parent  fd781c98a3601b6ae9c8ff393947ee023e6ef35c
merge of 'a20a45414d71cd9c0ab697cf0d6209bea8d9140c'
     and 'cde2d2ed1c69105e71b77c426cb80f3281163065'

diff -r 1a6c2144ba08 -r ae86b03162aa pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Fri Jul 31 04:09:41 2009 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Fri Jul 31 04:21:28 2009 +0000
@@ -720,11 +720,11 @@
     Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority.pem"
     Delete "$INSTDIR\ca-certs\StartCom_Certification_Authority.pem"
     Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem"
-	Delete "$INSTDIR\ca-certs\Thawte_Premium_Server_CA.pem"
-	Delete "$INSTDIR\ca-certs\VeriSign_Class3_Extended_Validation_CA.pem"
+    Delete "$INSTDIR\ca-certs\Thawte_Premium_Server_CA.pem"
+    Delete "$INSTDIR\ca-certs\VeriSign_Class3_Extended_Validation_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem"
-	Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem"
+    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_International_Server_Class_3_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_RSA_Secure_Server_CA.pem"
     RMDir "$INSTDIR\ca-certs"