Merge commit 'mlcastle/master'

diff --git a/src/keytrans/openpgp2ssh.c b/src/keytrans/openpgp2ssh.c
index 511af719d7b69dfb936214ef61ba4453705f6a22..92bdc1955c81e0cada4eb80a5177017f5b226575 100644 (file)
--- 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;
     }
   }