From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 21 Jun 2008 16:36:15 +0000 (-0400)
Subject: Merge commit 'mlcastle/master'
X-Git-Tag: monkeysphere_0.2-1~12^2~7
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=e4c99f298bd4e7451b3ba0a9d08a4eda9583d544;hp=6d1876a1fddb9558a3c01b577a2b571aecfefc2f

Merge commit 'mlcastle/master'
---

diff --git a/src/keytrans/openpgp2ssh.c b/src/keytrans/openpgp2ssh.c
index 511af71..92bdc19 100644
--- a/src/keytrans/openpgp2ssh.c
+++ b/src/keytrans/openpgp2ssh.c
@@ -427,7 +427,7 @@ int main(int argc, char* argv[]) {
       
     } else {
       /* we have no idea what kind of key this is at all anyway! */
-      err(0,"Input does contain any form of OpenPGP key I recognize.\n");
+      err(0,"Input does not contain any form of OpenPGP key I recognize.\n");
       return 1;
     }
   }