Mercurial > pidgin
diff share/ca-certs/GTE_CyberTrust_Global_Root.pem @ 25209:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 82953ee5b3e6 |
children |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 82953ee5b3e6 |
children |