Mercurial > pidgin
comparison share/ca-certs/Microsoft_Secure_Server_Authority.pem @ 25209:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | aeb287e5d232 |
children | d9e3434d6416 |
comparison
equal
deleted
inserted
replaced
25208:6f94b4a27372 | 25209:e3bb0bbfa388 |
---|