Merge branch 'master' of git://labs.riseup.net/~micah/monkeysphere
[monkeysphere.git] / src / pem2openpgp
1 share/keytrans