Merge branch '1.6.x'

Conflicts:
	modules/bouncedcc.cpp
This commit is contained in:
J-P Nurmi
2015-09-20 23:36:44 +02:00
4 changed files with 6 additions and 5 deletions

View File

@@ -32,7 +32,7 @@ public:
"[pubkey]", "If pubkey is not provided will use the current key");
AddCommand("Del", static_cast<CModCommand::ModCmdFunc>(&CSSLClientCertMod::HandleDelCommand),
"id");
AddCommand("List", static_cast<CModCommand::ModCmdFunc>(&CSSLClientCertMod::HandleListCommand));
AddCommand("List", static_cast<CModCommand::ModCmdFunc>(&CSSLClientCertMod::HandleListCommand),"", "List your public keys");
AddCommand("Show", static_cast<CModCommand::ModCmdFunc>(&CSSLClientCertMod::HandleShowCommand),
"", "Print your current key");
}