Mercurial > pidgin.yaz
comparison share/ca-certs/CAcert_Root.pem @ 26243:90ffe6f71fa9
clearing conflicts while merging from im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
---|---|
date | Tue, 20 Jan 2009 17:11:35 +0000 |
parents | 2f8866314c64 |
children |
comparison
equal
deleted
inserted
replaced
26242:97c420d62381 | 26243:90ffe6f71fa9 |
---|