Mercurial > pidgin
diff share/ca-certs/GTE_CyberTrust_Global_Root.pem @ 31719:e0856c50cdd8
Fix the merge some more
I don't know whether this was me, kdiff3, or monotone on something.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 26 Jun 2011 20:37:03 +0000 |
parents | 82953ee5b3e6 |
children |