Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2017-04-25 01:42:59 +02:00
commit d10300eca4
5 changed files with 21 additions and 4 deletions

View file

@ -936,7 +936,7 @@ function commands.cert(arg)
return cert_commands[subcmd](arg);
end
end
show_usage("cert config|request|generate|key", "Helpers for generating X.509 certificates and keys.")
show_usage("cert config|request|generate|key|import", "Helpers for generating X.509 certificates and keys.")
end
function commands.check(arg)