Mercurial > pidgin
diff share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem @ 31718:f2a3c59fc4a6
Fix up merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | 02c0a2640fc2 |
children |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | 02c0a2640fc2 |
children |